diff options
author | adelcastillo <adelcastillo@us.es> | 2009-11-06 17:30:20 +0000 |
---|---|---|
committer | adelcastillo <adelcastillo@us.es> | 2009-11-06 17:30:20 +0000 |
commit | e02f9b41fe9415034ffc164f93da7921ca38dc02 (patch) | |
tree | 4aeb05d609cf0db2e32b41f9042947b97797b368 /client/browser | |
parent | 02c4a41a8f9f39825d8d282153666fc4829f0672 (diff) |
Nuevo browser compilado.
git-svn-id: https://opengnsys.es/svn/trunk@519 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/browser')
-rw-r--r-- | client/browser/CMakeLists.txt | 36 | ||||
-rw-r--r-- | client/browser/qtermwidget/CMakeLists.txt | 7 | ||||
-rw-r--r-- | client/browser/src/mainwindow.cpp | 2 |
3 files changed, 1 insertions, 44 deletions
diff --git a/client/browser/CMakeLists.txt b/client/browser/CMakeLists.txt deleted file mode 100644 index 2c595c41..00000000 --- a/client/browser/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/client/browser/qtermwidget/CMakeLists.txt b/client/browser/qtermwidget/CMakeLists.txt deleted file mode 100644 index c503292c..00000000 --- a/client/browser/qtermwidget/CMakeLists.txt +++ /dev/null @@ -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}) diff --git a/client/browser/src/mainwindow.cpp b/client/browser/src/mainwindow.cpp index 2dea0a23..88335a05 100644 --- a/client/browser/src/mainwindow.cpp +++ b/client/browser/src/mainwindow.cpp @@ -28,7 +28,7 @@ MainWindow::MainWindow(QWidget *parent) m_logfile(0),m_logstream(0),m_numberTerminal(0) { // Graphic - //showFullScreen(); + showFullScreen(); setWindowTitle(tr("OpenGNSys Browser")); |