diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
| commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
| tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /src/corelib/corelib.pro | |
| parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
| parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 2bac1bcbef..cbfb457212 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -54,7 +54,10 @@ HOST_BINS = $$[QT_HOST_BINS/raw] host_bins.name = host_bins host_bins.variable = HOST_BINS -QMAKE_PKGCONFIG_VARIABLES += host_bins +qt_conf.name = qt_config +qt_conf.variable = QT_CONFIG + +QMAKE_PKGCONFIG_VARIABLES += host_bins qt_conf ctest_macros_file.input = $$PWD/Qt5CTestMacros.cmake ctest_macros_file.output = $$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake |