diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-06-02 11:29:36 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-06-02 11:29:36 (GMT) |
| commit | bbbd6e7ec5845225868c01116fceb9b1e5cdb038 (patch) | |
| tree | 0871f867c6becfee9296419cde17afa96386fe82 | |
| parent | addc4d77f781f05a203638a26035afb1076c6d64 (diff) | |
| parent | 1cc91f422888d68f24dec136f521620300e35558 (diff) | |
| download | Qt-bbbd6e7ec5845225868c01116fceb9b1e5cdb038.zip Qt-bbbd6e7ec5845225868c01116fceb9b1e5cdb038.tar.gz Qt-bbbd6e7ec5845225868c01116fceb9b1e5cdb038.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rwxr-xr-x | configure.exe | bin | 868352 -> 868352 bytes | |||
| -rw-r--r-- | confqt.bat | 1 | ||||
| -rw-r--r-- | confsbsv2.bat | 1 | ||||
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 4 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex 706b3b4..7d8861e 100755 --- a/configure.exe +++ b/configure.exe diff --git a/confqt.bat b/confqt.bat deleted file mode 100644 index b1474a7..0000000 --- a/confqt.bat +++ /dev/null @@ -1 +0,0 @@ -configure -platform win32-mwc -xplatform symbian-abld -qt-sql-sqlite -system-sqlite -nokia-developer %* diff --git a/confsbsv2.bat b/confsbsv2.bat deleted file mode 100644 index f3a8424..0000000 --- a/confsbsv2.bat +++ /dev/null @@ -1 +0,0 @@ -configure -platform win32-mwc -xplatform symbian-sbsv2 -qt-sql-sqlite -system-sqlite -nokia-developer %* 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<QFile *>(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 } diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b4a14f2..81ddf4a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1429,7 +1429,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 |