aboutsummaryrefslogtreecommitdiffstats
path: root/build_history
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2017-08-23 16:47:14 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2017-08-24 10:30:18 +0000
commit91d37a1381b77c12a1c99ea43f5b1bf464a0ff40 (patch)
tree2ff4ebc148d34dbede569533fbfc4d7e3eee8169 /build_history
parent8aca0dec116c6b321373f5636b34036530ac6e4b (diff)
Streamline Qt5 detection on macOS
This consists of a few things: - Remove the detection and usage of ALTERNATIVE_QT_INCLUDE_DIR in setup.py, because CMake takes care of finding the correct Qt include headers. - Add detection of framework / non-framework includes in the CMake rules, instead of in the setup.py script. - Don't pass QT_QMAKE_EXECUTABLE from setup.py to CMake, because it is not being used. It was previously used for detecting Qt4 via the CMake FindQt4.cmake file. Now it is done by find_package() which detects qmake from the environment. - Get rid of the old "/Library/Frameworks" QT_INCLUDE_DIR, which was where the official Qt 4.8.x packages installed Qt. - Deprecate usage of ALTERNATIVE_QT_INCLUDE_DIR. Now it is only used if CMake fails to detect the proper include headers of Qt5 (which should not happen). Change-Id: I829b92bc0d40ae7eb418be27c735fc095e557820 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_history')
0 files changed, 0 insertions, 0 deletions