projects / profile / ivi / qtbase.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d7e1426) | patch
Fix bug in configure where Qt did not compile with QT_ICONV=no
authorJan-Arve Saether <jan-arve.saether@nokia.com>
Tue, 21 Aug 2012 09:52:28 +0000 (11:52 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 23 Aug 2012 00:55:17 +0000 (02:55 +0200)
commit80462ee67848c68697d06fdf859dbcad99838f5b
tree78f6072dbfc901c094e0ab712855678e6e343c11tree | snapshot
parentd7e1426e1e76ddc4089e813450f021beb194ac74commit | 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>
tools/configure/configureapp.cpp diff | blob | history
Domain: UI Framework / Uncategorized;