diff options
| author | Mike Krus <mike.krus@kdab.com> | 2017-07-30 05:31:59 -0700 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-08-02 13:17:31 +0000 |
| commit | ec1df8c8f4579845ba733e6064a2e397d6b2a112 (patch) | |
| tree | 7b70573700b22850f5c42b9bfabc132f0bb98781 | |
| parent | 2cf98863dc67a994d1da693b28438fe4359c01c4 (diff) | |
Fix config for importing builds
Importing builds (in Creator) was broken because OUT_PWD is not
known at that time, reported as QTCREATORBUG-18663
Change-Id: Iccc0876b6568aeaabb003ea3177f9a095be1442a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | .qmake.conf | 3 | ||||
| -rw-r--r-- | src/core/aspects/aspects.pri | 2 | ||||
| -rw-r--r-- | src/render/backend/render-backend.pri | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 138038d54..b7100cffc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,6 @@ +QT3D_ROOT = $$PWD +QT3D_BUILD_ROOT = $$shadowed($$PWD) + load(qt_build_config) MODULE_VERSION = 5.10.0 diff --git a/src/core/aspects/aspects.pri b/src/core/aspects/aspects.pri index 54d939138..ced33f310 100644 --- a/src/core/aspects/aspects.pri +++ b/src/core/aspects/aspects.pri @@ -18,7 +18,7 @@ HEADERS += \ INCLUDEPATH += $$PWD -include($$OUT_PWD/../core/qt3dcore-config.pri) +include($$QT3D_BUILD_ROOT/src/core/qt3dcore-config.pri) QT_FOR_CONFIG += 3dcore-private qtConfig(qt3d-profile-jobs): { HEADERS += $$PWD/aspectcommanddebugger_p.h diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri index 74bd5022b..3d05b0df4 100644 --- a/src/render/backend/render-backend.pri +++ b/src/render/backend/render-backend.pri @@ -81,9 +81,9 @@ SOURCES += \ $$PWD/segmentsvisitor.cpp \ $$PWD/commandthread.cpp +include($$QT3D_BUILD_ROOT/src/core/qt3dcore-config.pri) QT_FOR_CONFIG += 3dcore-private qtConfig(qt3d-profile-jobs): { HEADERS += $$PWD/commandexecuter_p.h SOURCES += $$PWD/commandexecuter.cpp } - |