diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-22 11:34:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-22 12:01:02 +0200 |
| commit | 2d94c00ba8ffd902ffc25254a19d982ea6b0896e (patch) | |
| tree | 132aa9ed9c21ab74e7f523fbe8567a45cafead0a /src | |
| parent | 584156ba558df3ff4f63e32260726a4ba97355a9 (diff) | |
Export information about project file updates being available.
Clients need to set the define as well when including the header.
Change-Id: I0aa73cb2f530258685dc44b9da99d04d8d737b13
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 5 | ||||
| -rw-r--r-- | src/lib/corelib/use_corelib.pri | 1 | ||||
| -rw-r--r-- | src/lib/corelib/use_installed_corelib.pri | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 8968552cc..f14a65757 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -11,11 +11,13 @@ QbsLibrary { ".", "../.." // for the plugin headers ]) + property stringList projectFileUpdateDefines: + project.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : [] cpp.defines: base.concat([ "QBS_VERSION=\"" + version + "\"", "QT_CREATOR", "QML_BUILD_STATIC_LIB", // needed for QmlJS "SRCDIR=\"" + path + "\"" - ].concat(project.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : [])) + ]).concat(projectFileUpdateDefines) Properties { condition: qbs.targetOS.contains("darwin") @@ -384,5 +386,6 @@ QbsLibrary { } Export { Depends { name: "Qt"; submodules: ["script", "xml"] } + cpp.defines: projectFileUpdateDefines } } diff --git a/src/lib/corelib/use_corelib.pri b/src/lib/corelib/use_corelib.pri index ac3f309fb..ff746a94e 100644 --- a/src/lib/corelib/use_corelib.pri +++ b/src/lib/corelib/use_corelib.pri @@ -46,3 +46,4 @@ CONFIG += depend_includepath CONFIG(static, static|shared) { DEFINES += QBS_STATIC_LIB } +qbs_enable_project_file_updates:DEFINES += QBS_ENABLE_PROJECT_FILE_UPDATES diff --git a/src/lib/corelib/use_installed_corelib.pri b/src/lib/corelib/use_installed_corelib.pri index bac8d6da7..151988597 100644 --- a/src/lib/corelib/use_installed_corelib.pri +++ b/src/lib/corelib/use_installed_corelib.pri @@ -36,3 +36,4 @@ INCLUDEPATH += $${PWD} $${PWD}/.. CONFIG(static, static|shared) { DEFINES += QBS_STATIC_LIB } +qbs_enable_project_file_updates:DEFINES += QBS_ENABLE_PROJECT_FILE_UPDATES |