diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-26 19:35:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-04 18:17:23 +0200 |
| commit | 44ed7ca8c1f3be5165f070eaeb29274d9b60b6d8 (patch) | |
| tree | cd7ee2ba873123bdb8e9b28c53f1075606efa1ef | |
| parent | 0059bc7bb17d59202f8a1743b3f8946d4c8598a6 (diff) | |
escape backslashes (or don't use them at all, resp.)
(cherry picked from commit 0b52a873bda41c35ab640deadd6f30a3aa903ac7)
| -rw-r--r-- | doc/doc.pri | 4 | ||||
| -rw-r--r-- | qtcreator.pro | 2 | ||||
| -rw-r--r-- | src/tools/qtcdebugger/qtcdebugger.pro | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 19a040afc4..b4c8800f63 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 d00628a80a..6593c0fd33 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 ce8e9fdff1..f7ae016d0c 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 |