From fac0341e04bd84c8252697a069c5203835d3220c Mon Sep 17 00:00:00 2001 From: James Turner Date: Mon, 10 Apr 2017 22:18:19 +0100 Subject: [PATCH] Kill use of private header. --- src/GUI/CMakeLists.txt | 11 +---------- src/GUI/LauncherMainWindow.cxx | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index 570fe161e..6fcbbd738 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -144,19 +144,10 @@ if (HAVE_QT) ${uic_sources} ${qrc_sources}) - #HACK: CMake with broken Qt5Qml_PRIVATE_INCLUDE_DIRS - # This is needed for Qt 5.2, possibly 5.3. Can be removed if we raise - # the minimum version higher. - if(NOT "${Qt5Qml_PRIVATE_INCLUDE_DIRS}" MATCHES "/QtQml/") - list(APPEND Qt5Qml_PRIVATE_INCLUDE_DIRS "${_qt5Core_install_prefix}/include/QtCore/${Qt5Core_VERSION}/QtCore") - list(APPEND Qt5Qml_PRIVATE_INCLUDE_DIRS "${_qt5Qml_install_prefix}/include/QtQml/${Qt5Core_VERSION}/QtQml") - list(REMOVE_DUPLICATES Qt5Qml_PRIVATE_INCLUDE_DIRS) - endif() - set_property(TARGET fglauncher PROPERTY AUTOMOC ON) target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml SimGearCore) target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) - target_include_directories(fglauncher PRIVATE ${Qt5Qml_PRIVATE_INCLUDE_DIRS}) + #target_include_directories(fglauncher PRIVATE ${Qt5Qml_PRIVATE_INCLUDE_DIRS}) endif() diff --git a/src/GUI/LauncherMainWindow.cxx b/src/GUI/LauncherMainWindow.cxx index 4595c02ca..34ce507c0 100644 --- a/src/GUI/LauncherMainWindow.cxx +++ b/src/GUI/LauncherMainWindow.cxx @@ -12,8 +12,6 @@ #include #include -#include - // simgear headers #include