diff --git a/BaseLib/Configure.h.in b/BaseLib/Configure.h.in index 0baa5560a2aae33dc078212935b0b2416bf511c2..0d9a33c8155c2d953dc9bb73604618ee8d2c3d1f 100644 --- a/BaseLib/Configure.h.in +++ b/BaseLib/Configure.h.in @@ -12,7 +12,6 @@ #ifndef CONFIGURE_H #define CONFIGURE_H -#define OGS_QT_VERSION ${QT_VERSION_MAJOR}${QT_VERSION_MINOR} #define SOURCEPATH "${CMAKE_SOURCE_DIR}" #cmakedefine OGS_VERSION "${OGS_VERSION}" diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp index 0835ee32d85d3e9c0fa984a47efa131bea7a0a19..fcf9dd7785f16df5b1492fe379afdf8dac533721 100644 --- a/Gui/mainwindow.cpp +++ b/Gui/mainwindow.cpp @@ -253,11 +253,7 @@ MainWindow::MainWindow(QWidget* parent /* = 0*/) // Get info on screens geometry(ies) _vtkWidget = visualizationWidget->vtkWidget; QDesktopWidget* desktopWidget = QApplication::desktop(); -#if OGS_QT_VERSION < 46 - const unsigned int screenCount = desktopWidget->numScreens(); -#else const unsigned int screenCount = desktopWidget->screenCount(); -#endif // OGS_QT_VERSION < 46 for (size_t i = 0; i < screenCount; ++i) _screenGeometries.push_back(desktopWidget->availableGeometry((int)i)); diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index cb85ac80982dd2e1f722710dd80b813870c50273..57804f08fcccfdc167dbaaba4da3d016ebfee091 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -30,7 +30,7 @@ FIND_PACKAGE(Metis) ## Qt4 library ## IF(NOT OGS_DONT_USE_QT) - FIND_PACKAGE( Qt4 4.5) + FIND_PACKAGE( Qt4 4.7) ENDIF(NOT OGS_DONT_USE_QT) IF ( QT4_FOUND )