diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:05:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:06:31 +0200 |
| commit | 5c23199d4e8ff21661dfa5aacc13149178e78cab (patch) | |
| tree | 322aee61581d7c85f1ccb65e47d1e79eba1ba6c9 /.qmake.conf | |
| parent | 252bad7c589e03d3e12df02354b00a84d8e3159a (diff) | |
| parent | c8d9b17367cfdcb034d11f8a168ca4ae3993e7c3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/macx-xcode/Info.plist.app
mkspecs/macx-xcode/Info.plist.lib
qmake/doc/qmake.qdocconf
src/corelib/global/qglobal.h
tests/auto/other/exceptionsafety/exceptionsafety.pro
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf index 17dbc553bb..b6433664d8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,8 @@ load(qt_build_config) CONFIG += qt_example_installs +QT_SOURCE_TREE = $$PWD +QT_BUILD_TREE = $$shadowed($$PWD) + # In qtbase, all modules follow qglobal.h MODULE_VERSION = $$QT_VERSION |