diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-05 15:44:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-05 15:44:22 +0200 |
| commit | 248420904f194e93e238fc10ed0f11d8680a976d (patch) | |
| tree | 570038dd0e139289dfa20c0c9e9c0ca3312131dc /src/corelib/global | |
| parent | b73ad2dd197c5f35817bb33db17777596671478b (diff) | |
| parent | 930dc240d1938dac8d6512b947cb143fc91c3d21 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic6e1ae60f891a6b2b568936204d2e84db4177fb4
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/global.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 6ac32cd35d..4084d4f2ad 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -29,6 +29,11 @@ SOURCES += \ # qlibraryinfo.cpp includes qconfig.cpp INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global +# configure creates these, not syncqt, so we need to manually inject them +targ_headers.files += \ + $$OUT_PWD/global/qconfig.h \ + $$QT_BUILD_TREE/include/QtCore/QtConfig + # Only used on platforms with CONFIG += precompile_header PRECOMPILED_HEADER = global/qt_pch.h |