summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorJan-Arve Saether <jan-arve.saether@nokia.com>2012-08-21 11:52:28 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-23 02:55:17 +0200
commit80462ee67848c68697d06fdf859dbcad99838f5b (patch)
tree78f6072dbfc901c094e0ab712855678e6e343c11 /tools/configure
parentd7e1426e1e76ddc4089e813450f021beb194ac74 (diff)
Fix bug in configure where Qt did not compile with QT_ICONV=no
It did not compile because at the time qconfig.h was preprocessed, QT_NO_ICONV was already defined, causing the #define QT_NO_ICONV to fail. It should be guarded like most other defines in qconfig.h. Also fix QT_CUPS=no, QT_ICONV=no, QT_GLIB=no, QT_NOTIFY=no and QT_LARGEFILE_SUPPORT=64 the same way. Change-Id: Ic9e0295756c35cb7c62e18eb9b63b1410e7de051 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 2d80325976..7fc1c6246a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3139,26 +3139,16 @@ void Configure::generateConfigfiles()
else
qconfigList += "QT_NO_NIS";
- if (dictionary["LARGE_FILE"] == "yes")
- tmpStream << "#define QT_LARGEFILE_SUPPORT 64" << endl;
-
+ if (dictionary["LARGE_FILE"] == "yes") qconfigList += "QT_LARGEFILE_SUPPORT=64";
+ if (dictionary["QT_CUPS"] == "no") qconfigList += "QT_NO_CUPS";
+ if (dictionary["QT_ICONV"] == "no") qconfigList += "QT_NO_ICONV";
+ if (dictionary["QT_GLIB"] == "no") qconfigList += "QT_NO_GLIB";
+ if (dictionary["QT_INOTIFY"] == "no") qconfigList += "QT_NO_INOTIFY";
qconfigList.sort();
for (int i = 0; i < qconfigList.count(); ++i)
tmpStream << addDefine(qconfigList.at(i));
- if (dictionary[ "QT_CUPS" ] == "no")
- tmpStream<<"#define QT_NO_CUPS"<<endl;
-
- if (dictionary[ "QT_ICONV" ] == "no")
- tmpStream<<"#define QT_NO_ICONV"<<endl;
-
- if (dictionary[ "QT_GLIB" ] == "no")
- tmpStream<<"#define QT_NO_GLIB"<<endl;
-
- if (dictionary[ "QT_INOTIFY" ] == "no")
- tmpStream<<"#define QT_NO_INOTIFY"<<endl;
-
tmpStream<<"#define QT_QPA_DEFAULT_PLATFORM_NAME \"" << qpaPlatformName() << "\""<<endl;
tmpStream.flush();