diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-09-26 10:01:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-26 10:01:04 +0200 |
| commit | a55d47544a104bbe8270bd6b5a72a1215018059c (patch) | |
| tree | a922470562cd187d1b986a8db0df776e37cdc248 /qtcreator.pri | |
| parent | 996122b7e9c05c5baca56809d8cd2cf1b58a9f39 (diff) | |
| parent | 471f44aae3ca09d445ae4f424b2242b371580a3e (diff) | |
| download | qt-creator-a55d47544a104bbe8270bd6b5a72a1215018059c.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.qbp
src/plugins/qtsupport/baseqtversion.cpp
src/tools/tools.pro
Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 1e33eeb2d4..1b4b85f3ff 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -3,6 +3,10 @@ QTCREATOR_PRI_INCLUDED = 1 QTCREATOR_VERSION = 2.6.81 +isEmpty(QTC_PREFIX) { + unix:!macx: QTC_PREFIX = /usr/local +} + isEqual(QT_MAJOR_VERSION, 5) { defineReplace(cleanPath) { |