From 0b52a873bda41c35ab640deadd6f30a3aa903ac7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 26 May 2010 19:35:13 +0200
Subject: [PATCH] escape backslashes (or don't use them at all, resp.)
---
doc/doc.pri | 4 ++--
qtcreator.pro | 2 +-
src/tools/qtcdebugger/qtcdebugger.pro | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/doc.pri b/doc/doc.pri
index 19a040afc4f..b4c8800f634 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -7,8 +7,8 @@ equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys
# The lack of spaces in front of the && is necessary!
QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
} else { # nmake
- QDOC = set SRCDIR=$$PWD $$escape_expand(\n\t) \
- set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\n\t) \
+ QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \
+ set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \
$$QDOC_BIN
}
diff --git a/qtcreator.pro b/qtcreator.pro
index d00628a80af..6593c0fd33b 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -1,5 +1,5 @@
#version check qt
-contains(QT_VERSION, ^4\.[0-6]\..*) {
+contains(QT_VERSION, ^4\\.[0-6]\\..*) {
message("Cannot build Qt Creator with Qt version $${QT_VERSION}.")
error("Use at least Qt 4.7.")
}
diff --git a/src/tools/qtcdebugger/qtcdebugger.pro b/src/tools/qtcdebugger/qtcdebugger.pro
index ce8e9fdff1c..f7ae016d0cd 100644
--- a/src/tools/qtcdebugger/qtcdebugger.pro
+++ b/src/tools/qtcdebugger/qtcdebugger.pro
@@ -4,4 +4,4 @@ TARGET = qtcdebugger
TEMPLATE = app
SOURCES += main.cpp
-DESTDIR=..\..\..\bin
+DESTDIR=../../../bin
--
GitLab