diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
| commit | e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d (patch) | |
| tree | 08fa39a9605ec38a45247baea0e2053179f5970f /tools/configure | |
| parent | 838ed9c68aef4d5a4f0b4d4dbbc1c1f7797cde91 (diff) | |
| parent | 901ea45ca02dc8fbbf3f6112240c4e468c240b73 (diff) | |
| download | Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.zip Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.gz Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.bz2 | |
Merge commit 'origin/master' into fileEngines
Conflicts:
src/s60installs/bwins/QtCoreu.def
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 5b9d223..867f483 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" |