From 6e7c48df05189e4066c9e455a4b47cfd5d47a7e7 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 2 Jun 2009 10:12:07 +0300 Subject: Fixed qiodevice compilation error when QIODEVICE_DEBUG is defined. --- src/corelib/io/qiodevice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 3816803..765bf40 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -362,7 +362,7 @@ QIODevice::QIODevice() { #if defined QIODEVICE_DEBUG QFile *file = qobject_cast(this); - printf("%p QIODevice::QIODevice(\"%s\") %s\n", this, className(), + printf("%p QIODevice::QIODevice(\"%s\") %s\n", this, metaObject()->className(), qPrintable(file ? file->fileName() : QString())); #endif } @@ -375,7 +375,7 @@ QIODevice::QIODevice(QObject *parent) : QObject(*new QIODevicePrivate, parent) { #if defined QIODEVICE_DEBUG - printf("%p QIODevice::QIODevice(%p \"%s\")\n", this, parent, className()); + printf("%p QIODevice::QIODevice(%p \"%s\")\n", this, parent, metaObject()->className()); #endif } -- cgit v0.12 From f352f8e1bb1c34da9447f645eb923e322407d973 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 2 Jun 2009 13:26:21 +0300 Subject: Made -qt-sql-sqlite and -system-sqlite options default for confifure.exe In addition removed those options from confqt.bat and confsbsv2.bat --- configure.exe | Bin 868352 -> 1187840 bytes confqt.bat | 2 +- confsbsv2.bat | 2 +- tools/configure/configureapp.cpp | 4 +++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.exe b/configure.exe index 15a4d66..9b6621f 100755 Binary files a/configure.exe and b/configure.exe differ diff --git a/confqt.bat b/confqt.bat index b1474a7..30a5b5d 100644 --- a/confqt.bat +++ b/confqt.bat @@ -1 +1 @@ -configure -platform win32-mwc -xplatform symbian-abld -qt-sql-sqlite -system-sqlite -nokia-developer %* +configure -platform win32-mwc -xplatform symbian-abld -nokia-developer %* diff --git a/confsbsv2.bat b/confsbsv2.bat index f3a8424..a9194d4 100644 --- a/confsbsv2.bat +++ b/confsbsv2.bat @@ -1 +1 @@ -configure -platform win32-mwc -xplatform symbian-sbsv2 -qt-sql-sqlite -system-sqlite -nokia-developer %* +configure -platform win32-mwc -xplatform symbian-sbsv2 -nokia-developer %* diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9b44fb5..4ac93f6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1428,7 +1428,9 @@ void Configure::applySpecSpecifics() dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ]; dictionary[ "QT_INSTALL_PREFIX" ] = ""; dictionary[ "QT_INSTALL_PLUGINS" ] = "\\resource\\qt\\plugins"; - dictionary[ "ARM_FPU_TYPE" ] = "softvfp"; + dictionary[ "ARM_FPU_TYPE" ] = "softvfp"; + dictionary[ "SQL_SQLITE" ] = "yes"; + dictionary[ "SQL_SQLITE_LIB" ] = "system"; } else if(dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong. //TODO -- cgit v0.12 From 4dea80184af6eb3316b5765d9b2ebee2befdc64f Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 2 Jun 2009 13:52:54 +0300 Subject: Removed confqt.bat and confsbsv2.bat. These files were added for convenience purposes, but they were meant to be only temporary solution. Now all SSL and SQL related parameters confqt.bat used to pass for configure.exe have been made default values of configure.exe. To configure Qt for S60 you can use the following command line: configure -platform win32-mwc -xplatform symbian-abld To configure Qt for S60 by using SBSv2 toolchain (Raptor) you can use the following command line: configure -platform win32-mwc -xplatform symbian-sbsv2 --- confqt.bat | 1 - confsbsv2.bat | 1 - 2 files changed, 2 deletions(-) delete mode 100644 confqt.bat delete mode 100644 confsbsv2.bat diff --git a/confqt.bat b/confqt.bat deleted file mode 100644 index 30a5b5d..0000000 --- a/confqt.bat +++ /dev/null @@ -1 +0,0 @@ -configure -platform win32-mwc -xplatform symbian-abld -nokia-developer %* diff --git a/confsbsv2.bat b/confsbsv2.bat deleted file mode 100644 index a9194d4..0000000 --- a/confsbsv2.bat +++ /dev/null @@ -1 +0,0 @@ -configure -platform win32-mwc -xplatform symbian-sbsv2 -nokia-developer %* -- cgit v0.12 From 1cc91f422888d68f24dec136f521620300e35558 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 2 Jun 2009 13:05:02 +0200 Subject: Recompiled configure.exe with MSVC6. --- configure.exe | Bin 1187840 -> 868352 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configure.exe b/configure.exe index c4b5d7f..7d8861e 100755 Binary files a/configure.exe and b/configure.exe differ -- cgit v0.12