Nuevo browser compilado.
git-svn-id: https://opengnsys.es/svn/trunk@519 a21b9725-9963-47de-94b9-378ad31fedc9remotes/github/master
parent
8ab4781a53
commit
987869ca55
|
@ -1,36 +0,0 @@
|
||||||
project(browser)
|
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 2.6)
|
|
||||||
|
|
||||||
|
|
||||||
if(QTEMBEDDED)
|
|
||||||
#set(QT_INCLUDES /usr/local/Trolltech/include/)
|
|
||||||
find_library(QT_LIBRARY NAMES QtWebKit PATHS /usr/local/Trolltech/QtEmbedded-4.5.1/lib/)
|
|
||||||
message("${QT_LIBRARY}")
|
|
||||||
message("Embedded")
|
|
||||||
|
|
||||||
else(QTEMBEDDED)
|
|
||||||
find_package(Qt4 REQUIRED)
|
|
||||||
message("Normal")
|
|
||||||
endif(QTEMBEDDED)
|
|
||||||
|
|
||||||
# This saves typing ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY} in about every subdir
|
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|
||||||
|
|
||||||
include_directories(qtermwidget/src/ ${QT_INCLUDES} ${QT_QTWEBKIT_INCLUDE_DIR})
|
|
||||||
|
|
||||||
add_subdirectory(qtermwidget)
|
|
||||||
|
|
||||||
set(browser_SRCS src/main.cpp src/mainwindow.cpp)
|
|
||||||
|
|
||||||
qt4_automoc(${browser_SRCS})
|
|
||||||
|
|
||||||
add_executable(browser ${browser_SRCS})
|
|
||||||
|
|
||||||
target_link_libraries(browser qtermwidget ${QT_QTWEBKIT_LIBRARIES} )
|
|
||||||
|
|
||||||
# set(CMAKE_CXX_FLAGS "-static")
|
|
||||||
|
|
||||||
foreach(QT ${QT_LIBRARIES})
|
|
||||||
message("${QT}")
|
|
||||||
endforeach(QT)
|
|
|
@ -1,7 +0,0 @@
|
||||||
add_definitions(-DHAVE_POSIX_OPENPT)
|
|
||||||
|
|
||||||
aux_source_directory(src qtermwidget_SRCS)
|
|
||||||
|
|
||||||
qt4_automoc(${qtermwidget_SRCS})
|
|
||||||
|
|
||||||
add_library(qtermwidget STATIC ${qtermwidget_SRCS})
|
|
|
@ -28,7 +28,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
m_logfile(0),m_logstream(0),m_numberTerminal(0)
|
m_logfile(0),m_logstream(0),m_numberTerminal(0)
|
||||||
{
|
{
|
||||||
// Graphic
|
// Graphic
|
||||||
//showFullScreen();
|
showFullScreen();
|
||||||
|
|
||||||
setWindowTitle(tr("OpenGNSys Browser"));
|
setWindowTitle(tr("OpenGNSys Browser"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue