diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-09-28 11:14:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-09-28 11:14:23 (GMT) |
| commit | 38d7fb497eec5491e2d845e7eb5522dafc6ab42b (patch) | |
| tree | 9b51ec779b10296ce1cc8ebae29d069c1d2edd55 /tools/configure | |
| parent | 2868302626b8a31f44df1068514485a89ec27171 (diff) | |
| parent | 7b796b4dcdebfba55c4754d241edb334217fc550 (diff) | |
| download | Qt-38d7fb497eec5491e2d845e7eb5522dafc6ab42b.zip Qt-38d7fb497eec5491e2d845e7eb5522dafc6ab42b.tar.gz Qt-38d7fb497eec5491e2d845e7eb5522dafc6ab42b.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/painting/qrasterizer.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/mainwindow.cpp
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configure.pro | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index 8a62fe1..810f006 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -1,5 +1,5 @@ TARGET = configure -DESTDIR = ../.. +DESTDIR = $$PWD/../.. # build directly in source dir CONFIG += console flat CONFIG -= moc qt diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 6c12cc2..31c115a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2436,7 +2436,7 @@ void Configure::generateBuildKey() + buildSymbianKey + "\"\n" "#else\n" // Debug builds - "# if (!QT_NO_DEBUG)\n" + "# if !defined(QT_NO_DEBUG)\n" "# if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n" + build64Key.arg("debug") + "\"\n" "# else\n" |