summaryrefslogtreecommitdiff
path: root/qtcreator.pri
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2012-10-16 17:42:10 +0200
committerEike Ziller <eike.ziller@digia.com>2012-10-16 17:42:10 +0200
commit70b5e1f64d118f26cb045ce43203c14098004d9e (patch)
treeef5a9cd8597cc98129c20684620479cc8272ccaf /qtcreator.pri
parent07565f155f3e0cb3a1ed961a0723f94d9b4e85dd (diff)
parent1982a3b5a536c4a552b7908c3dc2151e68bd5726 (diff)
downloadqt-creator-70b5e1f64d118f26cb045ce43203c14098004d9e.tar.gz
Merge remote-tracking branch 'origin/2.6'
Conflicts: src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
Diffstat (limited to 'qtcreator.pri')
-rw-r--r--qtcreator.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri
index 1e33eeb2d4..6641479319 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -184,3 +184,5 @@ qt:greaterThan(QT_MAJOR_VERSION, 4) {
contains(QT, gui): QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900
}
+
+OTHER_FILES += $$replace(_PRO_FILE_, \\.pro$, .qbs)