Merge remote-tracking branch 'gerrit/2.6'

Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2

1 files changed, 26 insertions, 1 deletions

diff --git a/qtcreator.pri b/qtcreator.pri
index 908c453f5e..1e33eeb2d4 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -3,6 +3,18 @@ QTCREATOR_PRI_INCLUDED = 1
 
 QTCREATOR_VERSION = 2.6.81
 
+isEqual(QT_MAJOR_VERSION, 5) {
+
+defineReplace(cleanPath) {
+    return($$clean_path($$1))
+}
+
+defineReplace(targetPath) {
+    return($$shell_path($$1))
+}
+
+} else { # qt5
+
 defineReplace(cleanPath) {
     win32:1 ~= s|\\\\|/|g
     contains(1, ^/.*):pfx = /
@@ -20,6 +32,8 @@ defineReplace(targetPath) {
     return($$replace(1, /, $$QMAKE_DIR_SEP))
 }
 
+} # qt5
+
 defineReplace(qtLibraryName) {
    unset(LIBRARY_NAME)
    LIBRARY_NAME = $$1
@@ -56,6 +70,15 @@ defineTest(minQtVersion) {
     return(false)
 }
 
+isEqual(QT_MAJOR_VERSION, 5) {
+
+# For use in custom compilers which just copy files
+defineReplace(stripSrcDir) {
+    return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_))
+}
+
+} else { # qt5
+
 # For use in custom compilers which just copy files
 win32:i_flag = i
 defineReplace(stripSrcDir) {
@@ -65,10 +88,12 @@ defineReplace(stripSrcDir) {
         !contains(1, ^/.*):1 = $$OUT_PWD/$$1
     }
     out = $$cleanPath($$1)
-    out ~= s|^$$re_escape($$PWD/)||$$i_flag
+    out ~= s|^$$re_escape($$_PRO_FILE_PWD_/)||$$i_flag
     return($$out)
 }
 
+} # qt5
+
 isEmpty(TEST):CONFIG(debug, debug|release) {
     !debug_and_release|build_pass {
         TEST = 1