diff options
| author | Iain <qt-info@nokia.com> | 2010-01-29 16:17:06 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2010-01-29 16:29:10 (GMT) |
| commit | 94e5195c84cbe0e7b37550af3eb1540b22bf2b4a (patch) | |
| tree | 0063efed46302ad415b45cb1f97a25d29d84d0ed | |
| parent | 8e8eb3591ea4725bd4217f8dae80c3ad4f529e12 (diff) | |
| download | Qt-94e5195c84cbe0e7b37550af3eb1540b22bf2b4a.zip Qt-94e5195c84cbe0e7b37550af3eb1540b22bf2b4a.tar.gz Qt-94e5195c84cbe0e7b37550af3eb1540b22bf2b4a.tar.bz2 | |
Remove warning about Symbian DEF files when running configure for Windows
Move SYMBIAN_DEFFILES definition in the dictionary into the Symbian
specific section of configure
Task-number: QTBUG-6556
Reviewed-by: Simon Hausmann
| -rw-r--r-- | configure.exe | bin | 1178112 -> 1178112 bytes | |||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex e64af40..b89999b 100644 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 8342fbe..599c13d 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -317,7 +317,6 @@ Configure::Configure( int& argc, char** argv ) dictionary[ "OPENSSL" ] = "auto"; dictionary[ "DBUS" ] = "auto"; dictionary[ "S60" ] = "yes"; - dictionary[ "SYMBIAN_DEFFILES" ] = "yes"; dictionary[ "STYLE_WINDOWS" ] = "yes"; dictionary[ "STYLE_WINDOWSXP" ] = "auto"; @@ -1475,6 +1474,7 @@ void Configure::applySpecSpecifics() dictionary[ "XMLPATTERNS" ] = "yes"; dictionary[ "QT_GLIB" ] = "no"; dictionary[ "S60" ] = "yes"; + dictionary[ "SYMBIAN_DEFFILES" ] = "yes"; // iconv makes makes apps start and run ridiculously slowly in symbian emulator (HW not tested) // iconv_open seems to return -1 always, so something is probably missing from the platform. dictionary[ "QT_ICONV" ] = "no"; |