fly/flightgear
1
0
Fork 0
Code Activity

Kill use of private header.

Browse source
This commit is contained in:
James Turner 2017-04-10 22:18:19 +01:00
parent 68ef30d3af
commit fac0341e04
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/GUI/CMakeLists.txt
View file

@ -144,19 +144,10 @@ if (HAVE_QT)
${uic_sources} ${uic_sources}
${qrc_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) set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml SimGearCore) 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 ${PROJECT_BINARY_DIR}/src/GUI)
target_include_directories(fglauncher PRIVATE ${Qt5Qml_PRIVATE_INCLUDE_DIRS}) #target_include_directories(fglauncher PRIVATE ${Qt5Qml_PRIVATE_INCLUDE_DIRS})
endif() endif()

2
src/GUI/LauncherMainWindow.cxx
View file

@ -12,8 +12,6 @@
#include <QQmlComponent> #include <QQmlComponent>
#include <QQmlContext> #include <QQmlContext>
#include <private/qqmlglobal_p.h>
// simgear headers // simgear headers
#include <simgear/package/Install.hxx> #include <simgear/package/Install.hxx>