From 9912dfdd92c9a45b5cb8b2e9aec1b5cd053ef0e4 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 28 Apr 2009 10:26:38 +0300 Subject: Fixed copy/paste error in QtNetworkSettings::expectedReplyFtp. --- tests/auto/network-settings.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 663d817..8056350 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -117,9 +117,7 @@ public: static QByteArray expectedReplyFtp() { - QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " ); - expected = expected.append(QtNetworkSettings::serverLocalName().toAscii()); - expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); + QByteArray expected( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" ); return expected; } -- cgit v0.12 From 5cd48cdbf67a1bb1f717a4b207272a9ac0ccf2ac Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 28 Apr 2009 10:28:07 +0300 Subject: Skipped disconnectWhileConnectingNoEventLoop for now in Symbian OS. This test case hanhs the execution always and causes problems in nighly buils and automatic executions. Skip it until it is fixed. --- tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index 6087e0d..0e1ccf3 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -987,6 +987,8 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop_data() void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop() { + QSKIP("Check this", SkipAll); + QFETCH(QByteArray, data); ReceiverThread thread; -- cgit v0.12 From 189118e55fa4d3ac205d78130d2b4694e0fc9b86 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 28 Apr 2009 10:34:09 +0300 Subject: Fixed unresolved merge conflict in network-settings.h --- tests/auto/network-settings.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 8195c40..9afe815 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -168,15 +168,12 @@ public: expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); return expected; } -<<<<<<< HEAD:tests/auto/network-settings.h static QByteArray expectedReplyFtp() { QByteArray expected( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" ); return expected; } -======= ->>>>>>> 6d41f31... Nwteork server test related data (serever name, IP address ...) can now:tests/auto/network-settings.h #ifdef Q_OS_SYMBIAN static void setDefaultIap() -- cgit v0.12 From da6f674fcdb0995d44e99ea8a82392d2b3f7b69c Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 28 Apr 2009 10:53:30 +0300 Subject: Re-enabled winscw target for non-OS_WIN builds. --- qmake/generators/symbian/symmake_sbsv2.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 541226f..fe25dd0 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -73,9 +73,6 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo QStringList debugPlatforms = allPlatforms; QStringList releasePlatforms = allPlatforms; releasePlatforms.removeAll("winscw"); // No release for emulator -#if !defined(Q_OS_WIN) - debugPlatforms.removeAll("winscw"); // Winscw is only for windows -#endif bool isSubdirs = getTargetExtension() == "subdirs"; @@ -344,7 +341,6 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t t << endl; -#if defined(Q_OS_WIN) // Write winscw deployment rules QString remoteTestPath = epocRoot() + QLatin1String("epoc32/winscw/c/private/") + privateDirUid; DeploymentList depList; @@ -356,7 +352,10 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t QString fromItem = depList.at(i).from; QString toItem = depList.at(i).to; fromItem.replace("\\", "/"); - toItem.replace("\\", "/").prepend(QDir::current().absolutePath().left(2)); // add drive + toItem.replace("\\", "/"); +#if defined(Q_OS_WIN) + toItem.prepend(QDir::current().absolutePath().left(2)); // add drive +#endif t << "OPTION DEPLOY_SOURCE " << fromItem << endl; t << "OPTION DEPLOY_TARGET " << toItem << endl; t << "END" << endl; @@ -364,7 +363,6 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t t << "#endif" << endl; t << endl; -#endif // ### TODO: Linux emulator (platsim?) deployment -- cgit v0.12 From 949ad6f6607783aace78f2fbf9c9632a39c37337 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 28 Apr 2009 11:02:21 +0300 Subject: These tst_qtcpsockets require more time to finish in Symbian OS The modified test cases are: - disconnectWhileConnecting - disconnectWhileLookingUp --- tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index 0e1ccf3..9d75fba 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -903,8 +903,12 @@ void tst_QTcpSocket::disconnectWhileConnecting() socket->disconnectFromHost(); } - connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot())); + connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot())); +#ifndef Q_OS_SYMBIAN enterLoop(10); +#else + enterLoop(30); +#endif QVERIFY2(!timeout(), "Network timeout"); QVERIFY(socket->state() == QAbstractSocket::UnconnectedState); if (!closeDirectly) { @@ -1060,7 +1064,11 @@ void tst_QTcpSocket::disconnectWhileLookingUp() // let anything queued happen QEventLoop loop; +#ifndef Q_OS_SYMBIAN QTimer::singleShot(50, &loop, SLOT(quit())); +#else + QTimer::singleShot(500, &loop, SLOT(quit())); +#endif loop.exec(); // recheck -- cgit v0.12 From bb183e1bc4ca51da6c2df80b309b01f9fc304366 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 28 Apr 2009 11:35:19 +0300 Subject: Changed generated file headers to have timestamp in ISO format instead of localized format. --- qmake/generators/symbian/initprojectdeploy_symbian.cpp | 2 +- qmake/generators/symbian/symmake.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index e0e19b1..23b2c50 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp @@ -58,7 +58,7 @@ static void createPluginStub(const QFileInfo& info, // Add note to stub so that people will not wonder what it is. // Creation date is added to make new stub to deploy always to // force plugin cache miss when loading plugins. - t << "This file is a Qt plugin stub file. The real Qt plugin is located in \\sys\\bin. Created:" << QDateTime::currentDateTime().toString() << "\n"; + t << "This file is a Qt plugin stub file. The real Qt plugin is located in \\sys\\bin. Created:" << QDateTime::currentDateTime().toString(Qt::ISODate) << "\n"; } else { fprintf(stderr, "cannot deploy \"%s\" because of plugin stub file creation failed\n", info.fileName().toLatin1().constData()); } diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 06e761a..69d09ac 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -123,7 +123,7 @@ void SymbianMakefileGenerator::writeHeader(QTextStream &t) { t << "// ============================================================================" << endl; t << "// * Makefile for building: " << escapeFilePath(var("TARGET")) << endl; t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; - t << QDateTime::currentDateTime().toString() << endl; + t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "// * This file is generated by qmake and should not be modified by the" << endl; t << "// * user." << endl; t << "// * Project: " << fileFixify(project->projectFile()) << endl; @@ -255,7 +255,7 @@ bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS // header info QTextStream t(&pkgFile); - t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString()) << endl; + t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString(Qt::ISODate)) << endl; t << "; This file is generated by qmake and should not be modified by the user" << endl; t << ";" << endl << endl; @@ -365,7 +365,7 @@ bool SymbianMakefileGenerator::writeCustomDefFile() { t << "; ==============================================================================" << endl; t << "; Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; - t << QDateTime::currentDateTime().toString() << endl; + t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "; This file is generated by qmake and should not be modified by the" << endl; t << "; user." << endl; t << "; Name : " PLUGIN_COMMON_DEF_FILE_ACTUAL << endl; @@ -614,7 +614,7 @@ bool SymbianMakefileGenerator::removeDuplicatedStrings(QStringList& stringList) bool SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t){ t << "// ==============================================================================" << endl; t << "// Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; - t << QDateTime::currentDateTime().toString() << endl; + t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "// This file is generated by qmake and should not be modified by the" << endl; t << "// user." << endl; t << "// Name : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length()-4,4))) << ".mmp" << endl; @@ -1129,7 +1129,7 @@ bool SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &us QTextStream t(&ft); t << "// ============================================================================" << endl; t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; - t << QDateTime::currentDateTime().toString() << endl; + t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "// * This file is generated by qmake and should not be modified by the" << endl; t << "// * user." << endl; t << "// ============================================================================" << endl; @@ -1164,7 +1164,7 @@ bool SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfI QTextStream t(&ft); t << "// ============================================================================" << endl; t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; - t << QDateTime::currentDateTime().toString() << endl; + t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "// * This file is generated by qmake and should not be modified by the" << endl; t << "// * user." << endl; t << "// ============================================================================" << endl; @@ -1208,7 +1208,7 @@ bool SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbi QTextStream t(&ft); t << "// ============================================================================" << endl; t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; - t << QDateTime::currentDateTime().toString() << endl; + t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "// * This file is generated by qmake and should not be modified by the" << endl; t << "// * user." << endl; t << "// ============================================================================" << endl; -- cgit v0.12 From f6e67190de05f0cb95545a22670e54ec1a1d6fe9 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 28 Apr 2009 15:00:07 +0300 Subject: Fixed ASSERT panic in Symbian event dispatcher. Moved ASSERT in QSelectThread::requestSocketEvents after mutex lock, since select thread might still have the lock and that's why the notifier might be in m_AOStatuses hash. After main thread has the mutex lock, notifier should not be anymroe in hash. --- src/corelib/kernel/qeventdispatcher_symbian.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index b38a6c6..f7605c8 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -365,9 +365,9 @@ void QSelectThread::requestSocketEvents ( QSocketNotifier *notifier, TRequestSta start(); } - Q_ASSERT(!m_AOStatuses.contains(notifier)); - QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex); + + Q_ASSERT(!m_AOStatuses.contains(notifier)); m_AOStatuses.insert(notifier, status); -- cgit v0.12 From 251e63bfcd5db5947ad3b6699cae6fd3d67d873c Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Tue, 28 Apr 2009 14:02:40 +0200 Subject: Simple refactoring how the data are fetched and stored. --- tests/auto/network-settings.h | 54 +++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 9afe815..952ab89 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -131,11 +131,10 @@ public: if(QtNetworkSettings::entries.contains("server.ip")) { QtNetworkSettingsRecord* entry = entries["server.ip"]; - QByteArray valueAsAscii = entry->recordValue().toAscii(); - if(*serverIPAscii == 0) { - ::strcpy(serverIPAscii, valueAsAscii.data()); + if(serverIp.isNull()) { + serverIp = entry->recordValue().toAscii(); } - return serverIPAscii; + return serverIp.data(); } #endif //return "10.10.0.147"; @@ -178,13 +177,22 @@ public: #ifdef Q_OS_SYMBIAN static void setDefaultIap() { + loadDefaultIap(); + struct ifreq ifReq; - strcpy( ifReq.ifr_name, getDefaultIap().toAscii().constData()); + if(entries.contains("iap.default")) { + QtNetworkSettingsRecord* entry = entries["iap.default"]; + QByteArray tmp(entry->recordValue().toAscii()); + strcpy( ifReq.ifr_name, tmp.data()); + } + else // some default value + strcpy( ifReq.ifr_name, "Lab"); + int err = setdefaultif( &ifReq ); if(err) - printf("Setting default IAP - '%s' failed: %d\n", getDefaultIap().toAscii().constData(), err); + printf("Setting default IAP - '%s' failed: %d\n", ifReq.ifr_name, err); else - printf("'%s' used as an default IAP\n", getDefaultIap().toAscii().constData()); + printf("'%s' used as an default IAP\n", ifReq.ifr_name); } #endif @@ -196,20 +204,14 @@ private: static bool bDefaultIapLoaded; static bool bTestSettingsLoaded; static QString iapFileFullPath; - static QString strDefaultIap; - static char serverIPAscii[256]; - - static QString getDefaultIap() { - if(!bDefaultIapLoaded) { - if(!loadDefaultIap()) // not found in file - use default - strDefaultIap = QString("Lab"); - } - - return strDefaultIap; - } + static QByteArray serverIp; static bool loadDefaultIap() { + if(bDefaultIapLoaded) + return true; + QFile iapCfgFile(iapFileFullPath); + bool bFoundDefaultIapTag = false; if (iapCfgFile.open(QFile::ReadOnly)) { @@ -222,21 +224,24 @@ private: if(line.contains(QString("[DEFAULT]"))) { bFoundDefaultIapTag = true; - } else if(line.startsWith(QString("[")) && bFoundDefaultIapTag) { - bFoundDefaultIapTag = false; - break; // stick to default + } else if(line.contains(QString("[")) && bFoundDefaultIapTag) { + break; } if(bFoundDefaultIapTag && line.contains("name")) { int position = line.indexOf(QString("=")); position += QString("=").length(); - strDefaultIap = line.mid(position).trimmed(); + + //create record + QtNetworkSettingsRecord *entry = + new QtNetworkSettingsRecord( QString("iap.default"), line.mid(position).trimmed() ); + entries.insert(entry->recordName(), entry); break; } } while (!line.isNull()); } - return bFoundDefaultIapTag; + return bDefaultIapLoaded = bFoundDefaultIapTag; } static bool loadTestSettings() { @@ -290,8 +295,7 @@ QHash QtNetworkSettings::entries = QHash Date: Tue, 28 Apr 2009 15:43:56 +0300 Subject: Always build Qt libs with "All -Tcb" capabilities in Symbian --- src/qbase.pri | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qbase.pri b/src/qbase.pri index 5ec63fb..d52120a 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -97,11 +97,7 @@ win32 { symbian { !static { DEFINES+=QT_MAKEDLL - contains(QT_EDITION, OpenSource) { - TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData - } else { - TARGET.CAPABILITY = All -Tcb - } + TARGET.CAPABILITY = All -Tcb } } win32-borland:INCLUDEPATH += kernel -- cgit v0.12 From 27e57ccd327fbc1edbb23d9959c5388023974dfc Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Tue, 28 Apr 2009 16:08:22 +0200 Subject: Enable dynamic [de|con]struction of window surfaces based on visibility When a window becomes completely obscured either because it has been hidden or another window is completely covering it, the backing store should be deallocated to save memory and then re-allocated when the window is later made visible again. Reviewed-by: Iain --- src/gui/kernel/qapplication_s60.cpp | 35 +++++++++++++++++++++++++---------- src/gui/kernel/qwidget_s60.cpp | 7 ++++--- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index b021b1c..c7bbcdb 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -531,6 +531,9 @@ TCoeInputCapabilities QSymbianControl::InputCapabilities() const void QSymbianControl::Draw(const TRect& r) const { QWindowSurface *surface = qwidget->windowSurface(); + if (!surface) + return; + QPaintEngine *engine = surface->paintDevice()->paintEngine(); if (!engine) return; @@ -948,6 +951,7 @@ int QApplication::s60ProcessEvent(TWsEvent *event) // Qt event handling. Handle some events regardless of if the handle is in our // widget map or not. CCoeControl* control = reinterpret_cast(event->Handle()); + const bool controlInMap = QWidgetPrivate::mapper && QWidgetPrivate::mapper->contains(control); switch (event->Type()) { #ifndef QT_NO_IM case EEventKey: @@ -970,17 +974,12 @@ int QApplication::s60ProcessEvent(TWsEvent *event) } #endif case EEventPointerEnter: - if (QWidgetPrivate::mapper && QWidgetPrivate::mapper->contains(control)) - { - // Qt::Enter will be generated in HandlePointerL - return 1; - } + if (controlInMap) + return 1; // Qt::Enter will be generated in HandlePointerL break; case EEventPointerExit: - if (QWidgetPrivate::mapper && QWidgetPrivate::mapper->contains(control)) - { - if (S60) - { + if (controlInMap) { + if (S60) { // mouseEvent outside our window, send leave event to last focused widget QMouseEvent mEvent(QEvent::Leave, S60->lastPointerEventPos, S60->lastCursorPos, Qt::NoButton, QApplicationPrivate::mouse_buttons, Qt::NoModifier); @@ -995,11 +994,27 @@ int QApplication::s60ProcessEvent(TWsEvent *event) if (S60) S60->updateScreenSize(); return 0; // Propagate to CONE + case EEventWindowVisibilityChanged: + if (controlInMap) { + const TWsVisibilityChangedEvent *visChangedEvent = event->VisibilityChanged(); + QWidget *w = QWidgetPrivate::mapper->value(control); + if (!w->d_func()->maybeTopData()) + break; + if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) { + delete w->d_func()->topData()->backingStore; + w->d_func()->topData()->backingStore = 0; + } else if ((visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible) + && !w->d_func()->maybeBackingStore()) { + w->d_func()->topData()->backingStore = new QWidgetBackingStore(w); + } + return 1; + } + break; default: break; } - if (!QWidgetPrivate::mapper || !QWidgetPrivate::mapper->contains(control)) + if (!controlInMap) return -1; return 0; diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 116dc35..ec80a18 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -195,12 +195,13 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO data.crect.moveTopLeft(QPoint(clientRect.iTl.iX, clientRect.iTl.iY)); QSymbianControl *control= new QSymbianControl(q); control->ConstructL(true,desktop); - if (!desktop) - { + if (!desktop) { QTLWExtra *topExtra = topData(); topExtra->rwindow = control->DrawableWindow(); // Request mouse move events. - topExtra->rwindow->PointerFilter(EPointerFilterEnterExit | EPointerFilterMove | EPointerFilterDrag, 0); + topExtra->rwindow->PointerFilter(EPointerFilterEnterExit + | EPointerFilterMove | EPointerFilterDrag, 0); + topExtra->rwindow->EnableVisibilityChangeEvents(); } id = (WId)control; -- cgit v0.12 From 5c0f4317665984746f9c2b2f93dbe6a6090318cf Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 29 Apr 2009 08:28:13 +0300 Subject: Fixed tst_QTcpSocket RVCT build when TEST_QNETWORK_PROXY is not defined. RVCT compiles also unused inline methods etc, for this reason QNetworkProxy needs to be included even it is not really used for anything. --- tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index 9d75fba..2e039bf 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -81,7 +81,8 @@ #ifndef TEST_QNETWORK_PROXY //#define TEST_QNETWORK_PROXY #endif -#ifdef TEST_QNETWORK_PROXY +#if defined(TEST_QNETWORK_PROXY) || defined (Q_CC_RVCT) +// RVCT compiles also unused inline methods # include #endif -- cgit v0.12 From 06b103c81a28237a568b3392e5e7954bb1ec7b1d Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 29 Apr 2009 10:40:36 +0300 Subject: Increased stack size for threads created in QLocalSocket autotests. The default stack size (8KB), caused KERN-EXEC 3 panics when executing tests in 5800 HW. --- tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index c289c24..50ac953 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -716,12 +716,18 @@ void tst_QLocalSocket::threadedConnection() QFETCH(int, threads); Server server; +#if defined(Q_OS_SYMBIAN) + server.setStackSize(0x14000); +#endif server.clients = threads; server.start(); QList clients; for (int i = 0; i < threads; ++i) { clients.append(new Client()); +#if defined(Q_OS_SYMBIAN) + clients.last()->setStackSize(0x14000); +#endif clients.last()->start(); } -- cgit v0.12 From 23b78dc988d9e5cf9e846510b0525166222b184c Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 29 Apr 2009 12:48:07 +0200 Subject: MSVC refuses to compile if variables get defined in a case block without braces. I think that is a useful feature. --- src/gui/styles/qs60style.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 58dcb98..059198d 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2157,12 +2157,13 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple ret = QCommonStyle::subControlRect(control, option, scontrol, widget); switch (scontrol) { case SC_GroupBoxCheckBox: //fallthrough - case SC_GroupBoxLabel: + case SC_GroupBoxLabel: { //slightly indent text and boxes, so that dialog border does not mess with them. const int horizontalSpacing = QS60StylePrivate::pixelMetric(QStyle::PM_LayoutHorizontalSpacing); const int bottomMargin = QS60StylePrivate::pixelMetric(QStyle::PM_LayoutBottomMargin); ret.adjust(2,horizontalSpacing-3,0,0); + } break; case SC_GroupBoxFrame: { const QRect textBox = subControlRect(control, option, SC_GroupBoxLabel, widget); -- cgit v0.12