diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-13 10:05:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-13 10:05:49 +0200 |
| commit | 9b102e953f3fd63f9f1d6a4ac2626354972c76d6 (patch) | |
| tree | 96813aeb37532532d7a6c841562f2f33a6f745f3 /src/corelib/global | |
| parent | 23d8a7fb237c433a74499dcd65aa60144aafbc46 (diff) | |
| parent | e2776b44a0e0e34e5a1d851916a94f7db5e7bb7b (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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 |