diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-07 10:20:03 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-07 10:20:03 +0100 |
| commit | b3c017c34102bdabfae9fa2cec7c089c9d91cb9d (patch) | |
| tree | 5bbed920b489f7f2ee40c618c82bbae72a84ec57 /qtcreator.pri | |
| parent | 04b9d7614e1fb6d657fca83d557b9efd5a62e141 (diff) | |
| parent | ba3c84e12b4cf262953b636fd3fec255c3537976 (diff) | |
| download | qt-creator-b3c017c34102bdabfae9fa2cec7c089c9d91cb9d.tar.gz | |
Merge branch '2.7'
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index a1c419a00a..91c8f726d6 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -187,4 +187,5 @@ qt:greaterThan(QT_MAJOR_VERSION, 4) { DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900 } -OTHER_FILES += $$replace(_PRO_FILE_, \\.pro$, .qbs) +QBSFILE = $$replace(_PRO_FILE_, \\.pro$, .qbs) +exists($$QBSFILE):OTHER_FILES += $$QBSFILE |