diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 11:50:17 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 11:50:17 +0200 |
| commit | d5d1c5e394b398fc138f2f9b00ec0aa5ab80a1ec (patch) | |
| tree | 37256a557227e20a6c78278439c4478f4a892c17 /qtcreator.pri | |
| parent | 8ec446efdc7f1d5b693df610ab3b8931712c2bd1 (diff) | |
| parent | 2b56943a8e6efa4e60c14b11afc8d9fefcca13eb (diff) | |
| download | qt-creator-d5d1c5e394b398fc138f2f9b00ec0aa5ab80a1ec.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/libs/utils/fileutils.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/genericdirectuploadservice.cpp
src/tools/qtcreatorcrashhandler/main.cpp
Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 1b4b85f3ff..1e33eeb2d4 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -3,10 +3,6 @@ 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) { |