diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-13 18:39:03 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-13 19:27:21 +0000 |
| commit | 59a3ca679ede2cb9b6a162edf8eba5cf6d9af4a9 (patch) | |
| tree | 0d0f76caa042db299cddaa84c14c28e4c80b2ffd /src/gui/gui.pro | |
| parent | 447a508d003ce487f2be69af9ab05aeec272e64d (diff) | |
| parent | 50d0f57b77b8088875d7185c5906b5f57985d5fb (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/gui/gui.pro')
| -rw-r--r-- | src/gui/gui.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 55837bcf3b..462f133ff8 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -23,8 +23,6 @@ win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) { \$\$QT_MODULE_INCLUDE_BASE/QtANGLE } -load(qt_module) - # Code coverage with TestCocoon # The following is required as extra compilers use $$QMAKE_CXX instead of $(CXX). # Without this, testcocoon.prf is read only after $$QMAKE_CXX is used by the @@ -50,6 +48,7 @@ include(itemmodels/itemmodels.pri) QMAKE_LIBS += $$QMAKE_LIBS_GUI +load(qt_module) load(cmake_functions) win32: CMAKE_WINDOWS_BUILD = True |