From 6b1724337bf0e7b47a87a6b65d04e9967cc47db6 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Aug 2009 11:18:47 +0300 Subject: Fixed qdir autotest for Symbian --- tests/auto/qdir/tst_qdir.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index ef31f53..13e8c95 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -60,6 +60,12 @@ #define Q_NO_SYMLINKS #endif +#if defined(Q_OS_SYMBIAN) +// Open C in Symbian doesn't support symbolic links to directories +#define Q_NO_SYMLINKS_TO_DIRS +#endif + + //TESTED_CLASS= //TESTED_FILES= @@ -183,11 +189,20 @@ void tst_QDir::getSetCheck() tst_QDir::tst_QDir() { +#ifdef Q_OS_SYMBIAN + // Can't deploy empty test dir, so create it here + QDir dir(SRCDIR); + dir.mkdir("testData"); +#endif } tst_QDir::~tst_QDir() { - +#ifdef Q_OS_SYMBIAN + // Remove created test dir + QDir dir(SRCDIR); + dir.rmdir("testData"); +#endif } void tst_QDir::construction() @@ -707,21 +722,23 @@ void tst_QDir::entryListSimple() void tst_QDir::entryListWithSymLinks() { #ifndef Q_NO_SYMLINKS +# ifndef Q_NO_SYMLINKS_TO_DIRS QFile::remove("myLinkToDir.lnk"); +# endif QFile::remove("myLinkToFile.lnk"); QFile::remove("testfile.cpp"); QDir dir; dir.mkdir("myDir"); QFile("testfile.cpp").open(QIODevice::WriteOnly); -#if !defined(Q_OS_SYMBIAN) +# ifndef Q_NO_SYMLINKS_TO_DIRS QVERIFY(QFile::link("myDir", "myLinkToDir.lnk")); -#endif +# endif QVERIFY(QFile::link("testfile.cpp", "myLinkToFile.lnk")); { QStringList entryList = QDir().entryList(); QVERIFY(entryList.contains("myDir")); -#if !defined(Q_OS_SYMBIAN) +# ifndef Q_NO_SYMLINKS_TO_DIRS QVERIFY(entryList.contains("myLinkToDir.lnk")); #endif QVERIFY(entryList.contains("myLinkToFile.lnk")); @@ -729,7 +746,7 @@ void tst_QDir::entryListWithSymLinks() { QStringList entryList = QDir().entryList(QDir::Dirs); QVERIFY(entryList.contains("myDir")); -#if !defined(Q_OS_SYMBIAN) +# ifndef Q_NO_SYMLINKS_TO_DIRS QVERIFY(entryList.contains("myLinkToDir.lnk")); #endif #if defined(Q_OS_SYMBIAN) -- cgit v0.12 From 5fe78207f44dbbf5c96560e69493653af55455a7 Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Fri, 14 Aug 2009 10:34:51 +0200 Subject: Partially revert oom safety fixes Turns out it's way too much work to make all the Pixmap backends strongly exception safe. Bumped to "future Qt version" :) --- src/gui/image/qpixmap.cpp | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 93077d7..8259c6f 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -854,14 +854,10 @@ bool QPixmap::load(const QString &fileName, const char *format, Qt::ImageConvers return false; QPixmap pm; - QT_TRY { - if (data->pixelType() == QPixmapData::BitmapType) - pm = QBitmap::fromImage(image, flags); - else - pm = fromImage(image, flags); - } QT_CATCH (const std::bad_alloc &) { - // swallow bad allocs and leave pm a null pixmap - } + if (data->pixelType() == QPixmapData::BitmapType) + pm = QBitmap::fromImage(image, flags); + else + pm = fromImage(image, flags); if (!pm.isNull()) { *this = pm; QPixmapCache::insert(key, *this); @@ -1993,16 +1989,11 @@ QPixmap QPixmap::fromImage(const QImage &image, Qt::ImageConversionFlags flags) if (image.isNull()) return QPixmap(); - QT_TRY { - QGraphicsSystem* gs = QApplicationPrivate::graphicsSystem(); - QScopedPointer data(gs ? gs->createPixmapData(QPixmapData::PixmapType) - : QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixmapType)); - data->fromImage(image, flags); - return QPixmap(data.take()); - } QT_CATCH(const std::bad_alloc &) { - // we're out of memory - return a null Pixmap - return QPixmap(); - } + QGraphicsSystem* gs = QApplicationPrivate::graphicsSystem(); + QScopedPointer data(gs ? gs->createPixmapData(QPixmapData::PixmapType) + : QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixmapType)); + data->fromImage(image, flags); + return QPixmap(data.take()); } /*! -- cgit v0.12 From 6a380ebcb50573149f723f1e407f5e4bdccae651 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Aug 2009 11:45:25 +0300 Subject: Fixed network-settings.h build for symbian --- tests/auto/network-settings.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 20d342d..702dabb 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -126,7 +126,7 @@ public: return "qt-test-server.wildcard.dev." + serverDomainName(); //return "qttest.wildcard.dev." + serverDomainName(); } - + #ifdef QT_NETWORK_LIB static QHostAddress serverIP() { @@ -140,11 +140,11 @@ public: } return QHostAddress(serverIp.data()); } -#endif +#endif return QHostInfo::fromName(serverName()).addresses().first(); } -#endif - +#endif + static QByteArray expectedReplyIMAP() { #ifdef Q_OS_SYMBIAN @@ -162,8 +162,8 @@ public: QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " ); expected = expected.append(QtNetworkSettings::serverName().toAscii()); expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); -#endif return expected; +#endif } static QByteArray expectedReplySSL() -- cgit v0.12 From a790e258d2ecd8e217d79d201f7e646bd13b1ce0 Mon Sep 17 00:00:00 2001 From: mread Date: Fri, 14 Aug 2009 09:50:45 +0100 Subject: Changed QCoeFepInputContext::ReportAknEdStateEvent so that it actually forwards the event and doesn't just send a fixed one. --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index d4f8341..833e000 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -102,7 +102,7 @@ void QCoeFepInputContext::reset() void QCoeFepInputContext::ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateEvent aEventType) { - QT_TRAP_THROWING(m_fepState->ReportAknEdStateEventL(QT_EAknCursorPositionChanged)); + QT_TRAP_THROWING(m_fepState->ReportAknEdStateEventL(aEventType)); } void QCoeFepInputContext::update() -- cgit v0.12 From 9042d6bbcda61f2234f17704a14389e3f399b131 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 14 Aug 2009 11:54:48 +0300 Subject: Fixed QKeySequence autotest for Symbian. --- tests/auto/qkeysequence/tst_qkeysequence.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp index ec36075..6deee02 100644 --- a/tests/auto/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp @@ -311,15 +311,7 @@ void tst_QKeySequence::standardKeys_data() QTest::newRow("zoomOut") << (int)QKeySequence::ZoomOut<< QString("CTRL+-"); QTest::newRow("whatsthis") << (int)QKeySequence::WhatsThis<< QString("SHIFT+F1"); -#ifndef Q_WS_MAC - QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F1"); - QTest::newRow("nextChild") << (int)QKeySequence::NextChild<< QString("CTRL+Tab"); - QTest::newRow("previousChild") << (int)QKeySequence::PreviousChild<< QString("CTRL+SHIFT+BACKTAB"); - QTest::newRow("forward") << (int)QKeySequence::Forward << QString("ALT+RIGHT"); - QTest::newRow("backward") << (int)QKeySequence::Back << QString("ALT+LEFT"); - QTest::newRow("MoveToEndOfBlock") << (int)QKeySequence::MoveToEndOfBlock<< QString(""); //mac only - QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only -#else +#if defined(Q_WS_MAC) QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("Ctrl+?"); QTest::newRow("nextChild") << (int)QKeySequence::NextChild << QString("CTRL+}"); QTest::newRow("previousChild") << (int)QKeySequence::PreviousChild << QString("CTRL+{"); @@ -327,6 +319,17 @@ void tst_QKeySequence::standardKeys_data() QTest::newRow("forward") << (int)QKeySequence::Forward << QString("CTRL+]"); QTest::newRow("backward") << (int)QKeySequence::Back << QString("CTRL+["); QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+DOWN"); //mac only +#elif defined(Q_WS_S60) + QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F2"); + QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only +#else + QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F1"); + QTest::newRow("nextChild") << (int)QKeySequence::NextChild<< QString("CTRL+Tab"); + QTest::newRow("previousChild") << (int)QKeySequence::PreviousChild<< QString("CTRL+SHIFT+BACKTAB"); + QTest::newRow("forward") << (int)QKeySequence::Forward << QString("ALT+RIGHT"); + QTest::newRow("backward") << (int)QKeySequence::Back << QString("ALT+LEFT"); + QTest::newRow("MoveToEndOfBlock") << (int)QKeySequence::MoveToEndOfBlock<< QString(""); //mac only + QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only #endif } @@ -343,7 +346,7 @@ void tst_QKeySequence::keyBindings() { QList bindings = QKeySequence::keyBindings(QKeySequence::Copy); QList expected; -#ifdef Q_WS_MAC +#if defined(Q_WS_MAC) || defined (Q_WS_S60) expected << QKeySequence("CTRL+C"); #elif defined Q_WS_X11 expected << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT"); @@ -505,7 +508,7 @@ void tst_QKeySequence::translated() #ifdef Q_WS_MAC QSKIP("No need to translate modifiers on Mac OS X", SkipAll); #elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) - QSKIP("No need to translate modifiers on WinCE", SkipAll); + QSKIP("No need to translate modifiers on WinCE or Symbian", SkipAll); #endif qApp->installTranslator(ourTranslator); -- cgit v0.12 From d00e02bcd814402ac97f3fa033c541e07f3f9549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Meril=C3=A4?= Date: Fri, 14 Aug 2009 12:42:10 +0300 Subject: S60Style: Draw non-initialized icons as enabled. --- src/gui/styles/qs60style.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 50eb2e1..1210316 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2783,7 +2783,7 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon, QS60StyleEnums::SkinParts part; QS60StylePrivate::SkinElementFlags adjustedFlags; if (option) - adjustedFlags = (option->state & State_Enabled) ? + adjustedFlags = (option->state & State_Enabled || option->state == 0) ? QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled; -- cgit v0.12 From 6c8ed1862908d2152946e806a329462a5678282c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Meril=C3=A4?= Date: Fri, 14 Aug 2009 12:59:00 +0300 Subject: S60Style: Draw QFrames in default cases --- src/gui/styles/qs60style.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 1210316..421ba78 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1871,6 +1871,8 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, //todo: update to horizontal table graphic QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_TableHeaderItem, painter, option->rect, flags | QS60StylePrivate::SF_PointWest); } + } else if (qobject_cast(widget)) { + QCommonStyle::drawControl(element, option, painter, widget); } if (option->state & State_HasFocus) drawPrimitive(PE_FrameFocusRect, option, painter, widget); -- cgit v0.12 From a955ff70b6954c5960654065d026bec849e79f1b Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Aug 2009 13:49:21 +0300 Subject: Fixed merge failure in qfsfileengine_unix.cpp. --- src/corelib/io/qfsfileengine_unix.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index 2b7a3f7..620d82f 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -803,20 +803,21 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const if (!(ret & RootFlag) && !d->isSymlink()) if(_q_isSymbianHidden(d->filePath, ret & DirectoryType)) ret |= HiddenFlag; -#endif +#else if (d->filePath == QLatin1String("/")) { ret |= RootFlag; } else { QString baseName = fileName(BaseName); if ((baseName.size() > 1 && baseName.at(0) == QLatin1Char('.') && baseName.at(1) != QLatin1Char('.')) -#if !defined(QWS) && defined(Q_OS_MAC) +# if !defined(QWS) && defined(Q_OS_MAC) || _q_isMacHidden(d->filePath) -#endif +# endif ) { ret |= HiddenFlag; } } +#endif } return ret; } -- cgit v0.12 From 388460b7d8c16468aca9799b4b0ce4ee55810ede Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Aug 2009 15:18:26 +0300 Subject: Fixed the tst_QFileInfo::isHidden test to actually test for hidden attribute in Symbian in a meaningful way. --- tests/auto/qfileinfo/qfileinfo.pro | 5 +++- tests/auto/qfileinfo/tst_qfileinfo.cpp | 52 ++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro index d46a83b..c3be825 100644 --- a/tests/auto/qfileinfo/qfileinfo.pro +++ b/tests/auto/qfileinfo/qfileinfo.pro @@ -13,4 +13,7 @@ wince*:|symbian*: { DEPLOYMENT = deploy res } -symbian:TARGET.CAPABILITY=AllFiles +symbian { + TARGET.CAPABILITY=AllFiles + LIBS *= -lefsrv + } diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index c53c86c..9184def 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -59,7 +59,10 @@ #endif #include #include - +#ifdef Q_OS_SYMBIAN +#include +#include +#endif #include "../network-settings.h" #include @@ -172,6 +175,10 @@ tst_QFileInfo::~tst_QFileInfo() QFile::remove("link.lnk"); QFile::remove("file1"); QFile::remove("dummyfile"); +#ifdef Q_OS_SYMBIAN + QFile::remove("hidden.txt"); + QFile::remove("nothidden.txt"); +#endif } // Testing get/set functions @@ -1006,13 +1013,13 @@ void tst_QFileInfo::isHidden_data() QTest::newRow("C:/RECYCLER/.") << QString::fromLatin1("C:/RECYCLER/.") << false; QTest::newRow("C:/RECYCLER/..") << QString::fromLatin1("C:/RECYCLER/..") << false; #endif -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) QTest::newRow("~/.qt") << QDir::homePath() + QString("/.qt") << true; QTest::newRow("~/.qt/.") << QDir::homePath() + QString("/.qt/.") << false; QTest::newRow("~/.qt/..") << QDir::homePath() + QString("/.qt/..") << false; #endif -#if !defined(Q_OS_WIN) +#if !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN) QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << false; #endif @@ -1021,6 +1028,45 @@ void tst_QFileInfo::isHidden_data() QTest::newRow("mac_private_etc") << QString::fromLatin1("/private/etc") << false; QTest::newRow("mac_Applications") << QString::fromLatin1("/Applications") << false; #endif + +#ifdef Q_OS_SYMBIAN + // No guaranteed hidden file knows to exist in Symbian filesystem, so make one. + QString hiddenFileName("hidden.txt"); + QString notHiddenFileName("nothidden.txt"); + QTest::newRow("hidden file") << hiddenFileName << true; + QTest::newRow("non-hidden file") << notHiddenFileName << false; + + { + QFile file(hiddenFileName); + if (file.open(QIODevice::WriteOnly)) { + QTextStream t(&file); + t << "foobar"; + } else { + qWarning("Failed to create hidden file"); + } + QFile file2(notHiddenFileName); + if (file2.open(QIODevice::WriteOnly)) { + QTextStream t(&file); + t << "foobar"; + } else { + qWarning("Failed to create non-hidden file"); + } + } + + RFs rfs; + TInt err = rfs.Connect(); + if (err == KErrNone) { + HBufC* symFile = qt_QString2HBufC(hiddenFileName); + err = rfs.SetAtt(*symFile, KEntryAttHidden, 0); + rfs.Close(); + delete symFile; + if (err != KErrNone) { + qWarning("Failed to set hidden attribute for test file"); + } + } else { + qWarning("Failed to open RFs session"); + } +#endif } void tst_QFileInfo::isHidden() -- cgit v0.12 From 2c6d744c6d9ab0b6af9734741404d4fb7e0e974e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Meril=C3=A4?= Date: Fri, 14 Aug 2009 15:26:19 +0300 Subject: S60Style: Draw vertical busy indicator with correct graphic. --- src/gui/styles/qs60style.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 421ba78..1226e22 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1636,7 +1636,9 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, if (optionProgressBar->minimum == optionProgressBar->maximum && optionProgressBar->minimum == 0) { // busy indicator - QS60StylePrivate::drawSkinPart(QS60StyleEnums::SP_QgnGrafBarWait, painter, progressRect,flags); + const int orientationFlag = optionProgressBar->orientation == Qt::Horizontal ? + QS60StylePrivate::SF_PointNorth : QS60StylePrivate::SF_PointWest; + QS60StylePrivate::drawSkinPart(QS60StyleEnums::SP_QgnGrafBarWait, painter, progressRect, flags | orientationFlag); } else { const qreal progressFactor = (optionProgressBar->minimum == optionProgressBar->maximum) ? 1.0 : (qreal)optionProgressBar->progress / optionProgressBar->maximum; -- cgit v0.12 From 8ea7bc92650e8e4c74e5ec2bbf05ef2b33107ee8 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Fri, 14 Aug 2009 15:13:56 +0200 Subject: Fix incorrect logic in QPixmap::fromSymbianCFbsBitmap. In some alternate universes it might make sense to use a pointer before checking if it is valid, but since this isn't one we shoudn't do it. Also extend the autotest a little to make sure we catch this case. --- src/gui/image/qpixmap_s60.cpp | 5 ++++- tests/auto/qpixmap/tst_qpixmap.cpp | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp index 58b3ee4..ab19924 100644 --- a/src/gui/image/qpixmap_s60.cpp +++ b/src/gui/image/qpixmap_s60.cpp @@ -202,10 +202,13 @@ return a null QPixmap. QPixmap QPixmap::fromSymbianCFbsBitmap(CFbsBitmap *bitmap) { + if (!bitmap) + return QPixmap(); + int width = bitmap->SizeInPixels().iWidth; int height = bitmap->SizeInPixels().iHeight; - if (!bitmap || width <= 0 || height <= 0 || bitmap->IsCompressedInRAM()) + if (width <= 0 || height <= 0 || bitmap->IsCompressedInRAM()) return QPixmap(); TDisplayMode displayMode = bitmap->DisplayMode(); diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 7321fe9..35d4cf3 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -1011,6 +1011,14 @@ void tst_QPixmap::fromSymbianCFbsBitmap() bitmapContext->Clear(); __UHEAP_MARK; + { // Test the null case + CFbsBitmap *bitmap = 0; + QPixmap pixmap = QPixmap::fromSymbianCFbsBitmap(bitmap); + QVERIFY(pixmap.isNull()); + } + __UHEAP_MARKEND; + + __UHEAP_MARK; { // Test the normal case QPixmap pixmap = QPixmap::fromSymbianCFbsBitmap(nativeBitmap); // QCOMPARE(pixmap.depth(), expectedDepth); // Depth is not preserved now -- cgit v0.12 From 982a43f68c3ed691b9d96e2937c05dfa4634207b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 14 Aug 2009 15:31:23 +0200 Subject: remove a ### comment The change is actually correct, as we only need the commented out codepath for debugging. --- src/corelib/codecs/qtextcodec.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index adfe2ed..4915c39 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -92,10 +92,8 @@ # define QT_NO_SETLOCALE #endif -#if 0 // ### TODO - remove me! // enabling this is not exception safe! -#define Q_DEBUG_TEXTCODEC -#endif +// #define Q_DEBUG_TEXTCODEC QT_BEGIN_NAMESPACE -- cgit v0.12 From 84003f563516e2c5c38440c8bdd63e21d7992aa9 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 14 Aug 2009 15:52:01 +0200 Subject: Removing some unused variables. Conflicts: src/gui/styles/qwindowsstyle.cpp --- src/gui/styles/qcleanlooksstyle.cpp | 5 ----- src/gui/styles/qplastiquestyle.cpp | 1 - src/gui/styles/qwindowscestyle.cpp | 1 - src/gui/styles/qwindowsmobilestyle.cpp | 5 ----- src/gui/styles/qwindowsstyle.cpp | 3 --- src/gui/styles/qwindowsxpstyle.cpp | 2 -- 6 files changed, 17 deletions(-) diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index fa6aeb2..0a82c9c 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -84,14 +84,9 @@ enum Direction { // from windows style static const int windowsItemFrame = 2; // menu item frame width -static const int windowsSepHeight = 6; // separator item height static const int windowsItemHMargin = 3; // menu item hor text margin static const int windowsItemVMargin = 8; // menu item ver text margin -static const int windowsArrowHMargin = 6; // arrow horizontal margin -static const int windowsTabSpacing = 12; // space between text and tab -static const int windowsCheckMarkHMargin = 2; // horiz. margins of check mark static const int windowsRightBorder = 15; // right border on windows -static const int windowsCheckMarkWidth = 12; // checkmarks width on windows /* XPM */ static const char * const dock_widget_close_xpm[] = { diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp index 89d4ca5..04559dc 100644 --- a/src/gui/styles/qplastiquestyle.cpp +++ b/src/gui/styles/qplastiquestyle.cpp @@ -98,7 +98,6 @@ static const int windowsItemHMargin = 3; // menu item hor text margin static const int windowsItemVMargin = 2; // menu item ver text margin static const int windowsArrowHMargin = 6; // arrow horizontal margin static const int windowsTabSpacing = 12; // space between text and tab -static const int windowsCheckMarkHMargin = 2; // horiz. margins of check mark static const int windowsRightBorder = 15; // right border on windows static const int windowsCheckMarkWidth = 12; // checkmarks width on windows diff --git a/src/gui/styles/qwindowscestyle.cpp b/src/gui/styles/qwindowscestyle.cpp index 49a1254..531b07e 100644 --- a/src/gui/styles/qwindowscestyle.cpp +++ b/src/gui/styles/qwindowscestyle.cpp @@ -56,7 +56,6 @@ QT_BEGIN_NAMESPACE static const int windowsItemFrame = 2; // menu item frame width -static const int windowsSepHeight = 9; // separator item height static const int windowsItemHMargin = 3; // menu item hor text margin static const int windowsItemVMargin = 2; // menu item ver text margin static const int windowsArrowHMargin = 6; // arrow horizontal margin diff --git a/src/gui/styles/qwindowsmobilestyle.cpp b/src/gui/styles/qwindowsmobilestyle.cpp index cad7463..414fc6f 100644 --- a/src/gui/styles/qwindowsmobilestyle.cpp +++ b/src/gui/styles/qwindowsmobilestyle.cpp @@ -83,11 +83,6 @@ extern bool qt_wince_is_windows_mobile_65(); //defined in qguifunctions_wince.cp QT_BEGIN_NAMESPACE static const int windowsItemFrame = 1; // menu item frame width -static const int windowsItemHMargin = 2; // menu item hor text margin -static const int windowsItemVMargin = 2; // menu item ver text margin -static const int windowsArrowHMargin = 6; // arrow horizontal margin -static const int windowsRightBorder = 15; // right border on windows -static const int windowsCheckMarkWidth = 14; // checkmarks width on windows static const int windowsMobileitemViewCheckBoxSize = 13; static const int windowsMobileFrameGroupBoxOffset = 9; diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index b03653c..e558844 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -121,9 +121,6 @@ static const int windowsSepHeight = 9; // separator item height static const int windowsItemHMargin = 3; // menu item hor text margin static const int windowsItemVMargin = 2; // menu item ver text margin static const int windowsArrowHMargin = 6; // arrow horizontal margin -static const int windowsTabSpacing = 12; // space between text and tab -// Save some space and avoid warning. -//static const int windowsCheckMarkHMargin = 2; // horiz. margins of check mark static const int windowsRightBorder = 15; // right border on windows static const int windowsCheckMarkWidth = 12; // checkmarks width on windows diff --git a/src/gui/styles/qwindowsxpstyle.cpp b/src/gui/styles/qwindowsxpstyle.cpp index 5da1e4e..191b71e 100644 --- a/src/gui/styles/qwindowsxpstyle.cpp +++ b/src/gui/styles/qwindowsxpstyle.cpp @@ -125,11 +125,9 @@ static PtrIsThemeBackgroundPartiallyTransparent pIsThemeBackgroundPartiallyTrans // General const values static const int windowsItemFrame = 2; // menu item frame width -static const int windowsSepHeight = 9; // separator item height static const int windowsItemHMargin = 3; // menu item hor text margin static const int windowsItemVMargin = 0; // menu item ver text margin static const int windowsArrowHMargin = 6; // arrow horizontal margin -static const int windowsCheckMarkHMargin = 0; // horiz. margins of check mark static const int windowsRightBorder = 12; // right border on windows // External function calls -- cgit v0.12 From 6cebef6e1609f32c3512e442ef40c04b847f51f8 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 14 Aug 2009 16:41:26 +0200 Subject: Remove the history files for autotest, and move the whitelist files to autotest repo. --- tests/auto/JoinResults.py | 66 ---------- tests/auto/_Categories/Qt3Support.txt | 51 -------- tests/auto/_Categories/QtCore.txt | 118 ------------------ tests/auto/_Categories/QtDBus.txt | 15 --- tests/auto/_Categories/QtGui.txt | 196 ------------------------------ tests/auto/_Categories/QtHelp.txt | 5 - tests/auto/_Categories/QtNetwork.txt | 33 ----- tests/auto/_Categories/QtOpenGl.txt | 1 - tests/auto/_Categories/QtScript.txt | 12 -- tests/auto/_Categories/QtSql.txt | 11 -- tests/auto/_Categories/QtSvg.txt | 3 - tests/auto/_Categories/QtTest.txt | 1 - tests/auto/_Categories/QtUiTools.txt | 1 - tests/auto/_Categories/QtWebkit.txt | 5 - tests/auto/_Categories/QtXml.txt | 5 - tests/auto/_Categories/QtXmlPatterns.txt | 27 ---- tests/auto/_Categories/all_categories.txt | 16 --- tests/auto/_Categories/phonon.txt | 2 - tests/auto/_Categories/qmake.txt | 1 - tests/auto/autobuildruncategory.bat | 11 -- tests/auto/autobuildrunsingle.bat | 71 ----------- tests/auto/autobuildtests.bat | 19 --- tests/auto/autobuildtestsmain.bat | 38 ------ tests/auto/compilecategory.bat | 4 - tests/auto/compilesingle.bat | 28 ----- 25 files changed, 740 deletions(-) delete mode 100644 tests/auto/JoinResults.py delete mode 100644 tests/auto/_Categories/Qt3Support.txt delete mode 100644 tests/auto/_Categories/QtCore.txt delete mode 100644 tests/auto/_Categories/QtDBus.txt delete mode 100644 tests/auto/_Categories/QtGui.txt delete mode 100644 tests/auto/_Categories/QtHelp.txt delete mode 100644 tests/auto/_Categories/QtNetwork.txt delete mode 100644 tests/auto/_Categories/QtOpenGl.txt delete mode 100644 tests/auto/_Categories/QtScript.txt delete mode 100644 tests/auto/_Categories/QtSql.txt delete mode 100644 tests/auto/_Categories/QtSvg.txt delete mode 100644 tests/auto/_Categories/QtTest.txt delete mode 100644 tests/auto/_Categories/QtUiTools.txt delete mode 100644 tests/auto/_Categories/QtWebkit.txt delete mode 100644 tests/auto/_Categories/QtXml.txt delete mode 100644 tests/auto/_Categories/QtXmlPatterns.txt delete mode 100644 tests/auto/_Categories/all_categories.txt delete mode 100644 tests/auto/_Categories/phonon.txt delete mode 100644 tests/auto/_Categories/qmake.txt delete mode 100644 tests/auto/autobuildruncategory.bat delete mode 100644 tests/auto/autobuildrunsingle.bat delete mode 100644 tests/auto/autobuildtests.bat delete mode 100644 tests/auto/autobuildtestsmain.bat delete mode 100644 tests/auto/compilecategory.bat delete mode 100644 tests/auto/compilesingle.bat diff --git a/tests/auto/JoinResults.py b/tests/auto/JoinResults.py deleted file mode 100644 index 8a98572..0000000 --- a/tests/auto/JoinResults.py +++ /dev/null @@ -1,66 +0,0 @@ -import string, sys, os, datetime, time, re -import socket - -Enviroment='' -RstPath='' -QtVersion='' - -def JoinResults(): - timestamp = time.localtime() - - #result_qt_WITH_symbian_ON_2008-05-15_09-42-48_USING_4.4.0-rc1.xml - rstFileName = time.strftime(RstPath+'\\result\\result_qt_WITH_symbian_ON_%Y-%m-%d_%H-%M-%S_USING_'+QtVersion+'.xml', timestamp) - rst = open(rstFileName,'w') - - rst.write('\n') - rst.write('\n') - rst.write('\n') - rst.write(''+socket.gethostname()+'\n') - rst.write('symbian-'+Enviroment+'\n') - rst.write('\n') - rst.write(time.strftime('\n',timestamp)) - - - for root, dirs, files in os.walk(RstPath): - for name in files: - if not re.search('result_qt_WITH_', name ) and \ - re.match(name.split('.')[1], 'xml'): - rst.write('\n') - path = root+'/'+name - temp = open(path,'r') - templines = temp.readlines() - Validate( templines ) - rst.writelines(templines); - temp.close() - rst.write('\n') - - rst.write('\n') - rst.close - -def Validate(lines): - regexp1 = re.compile('\s*\s*') - regexp2 = re.compile('\s* 0 and regexp1.search(line): - if regexp1Flag: - lines[index] = '' - else: - regexp1Flag = True - elif len(line) > 0 and regexp2.search(line): - if regexp2Flag: - lines[index] = '' - else: - regexp2Flag = True - else: - regexp1Flag = False - regexp2Flag = False - - -if __name__ == '__main__': - Enviroment = sys.argv[1] - RstPath = sys.argv[2] - QtVersion = sys.argv[3] - - JoinResults() diff --git a/tests/auto/_Categories/Qt3Support.txt b/tests/auto/_Categories/Qt3Support.txt deleted file mode 100644 index a55523c..0000000 --- a/tests/auto/_Categories/Qt3Support.txt +++ /dev/null @@ -1,51 +0,0 @@ -q3accel -q3action -q3actiongroup -q3buttongroup -q3canvas -q3checklistitem -q3combobox -q3cstring -q3databrowser -q3dateedit -q3datetimeedit -q3deepcopy -q3dict -q3dns -q3dockwindow -q3filedialog -q3frame -q3groupbox -q3hbox -q3header -q3iconview -q3listbox -q3listview -q3listviewitemiterator -q3mainwindow -q3popupmenu -q3process -q3progressbar -q3progressdialog -q3ptrlist -q3richtext -q3scrollview -q3semaphore -q3serversocket -q3socket -q3socketdevice -q3sqlcursor -q3sqlselectcursor -q3stylesheet -q3tabdialog -q3table -q3textbrowser -q3textedit -q3textstream -q3timeedit -q3toolbar -q3uridrag -q3urloperator -q3valuelist -q3valuevector -q3widgetstack diff --git a/tests/auto/_Categories/QtCore.txt b/tests/auto/_Categories/QtCore.txt deleted file mode 100644 index 452b6ba..0000000 --- a/tests/auto/_Categories/QtCore.txt +++ /dev/null @@ -1,118 +0,0 @@ -# QtCore - -collections -exceptionsafety -qabstractitemmodel -#Requires STL -qalgorithms -qanimationgroup -qatomicint -qatomicpointer -qbitarray -qbuffer -qbytearray -qbytearraymatcher -qcache -qchar -qcontiguouscache -qcoreapplication -qcryptographichash -qdatastream -qdate -qdatetime -qdebug -qdir -qdiriterator -qeasingcurve -qevent -qeventloop -qexplicitlyshareddatapointer -qfile cetest-subdir: test -qfileinfo -qfilesystemwatcher -qflags -qfuture -qfuturewatcher -qgetputenv -qglobal -qhash -qiodevice -qlibrary cetest-subdir: tst -qline -qlist -qlocale cetest-subdir: test -qmap -qmetaobject -qmetatype -qmutex -qmutexlocker -qnumeric -qobject cetest-pro: tst_qobject.pro -qobjectperformance -qobjectrace -qparallelanimationgroup -qplugin cetest-pro: tst_qplugin.pro -qpluginloader cetest-subdir: tst -qpoint -qpointer -qprocess cetest-subdir: test -qpropertyanimation -qqueue -qrand -qreadlocker -qreadwritelock -qrect -qregexp -qresourceengine -qringbuffer -qscopedpointer -qsemaphore -qsequentialanimationgroup -qset -qsettings -qsharedmemory cetest-subdir: test -qsharedpointer -qsignalmapper -qsignalspy -qsize -qsizef -qsocketnotifier -qstate -qstatemachine -#Requires STL -qstl -qstring -qstringlist -qstringmatcher -qsysinfo -qsystemsemaphore cetest-subdir: test -#qtconcurrentfilter Not supported yet for s60 -> skip(std) -# Uses std, though unclear if it is actually needed. To be re-investigated when QT_NO_CONCURRENT is removed. -#qtconcurrentiteratekernel -#qtconcurrentmap not supported yet for s60 -> skip(std) -qtconcurrentrun -qtconcurrentthreadengine -qtemporaryfile -qtextboundaryfinder -qtextcodec -qtextstream cetest-subdir: test -qthread -qthreadonce -qthreadpool -qthreadstorage -qtime -qtimeline -qtimer -# Requires MD5 Qt solutions to work -#qtmd5 -qtranslator -qurl -quuid -qvariant -qvarlengtharray -qvector -qwaitcondition -qwineventnotifier -qwritelocker -q_func_info -utf8 diff --git a/tests/auto/_Categories/QtDBus.txt b/tests/auto/_Categories/QtDBus.txt deleted file mode 100644 index 26490f1..0000000 --- a/tests/auto/_Categories/QtDBus.txt +++ /dev/null @@ -1,15 +0,0 @@ -qdbusabstractadaptor -qdbusconnection -qdbuscontext -qdbusinterface -qdbuslocalcalls -qdbusmarshall -qdbusmetaobject -qdbusmetatype -qdbuspendingcall -qdbuspendingreply -qdbusperformance -qdbusreply -qdbusserver -qdbusthreading -qdbusxmlparser diff --git a/tests/auto/_Categories/QtGui.txt b/tests/auto/_Categories/QtGui.txt deleted file mode 100644 index d8af499..0000000 --- a/tests/auto/_Categories/QtGui.txt +++ /dev/null @@ -1,196 +0,0 @@ -exceptionsafety_objects -#gestures This test is incomplete and also missing from auto.pro -> disabled for now -languagechange -math3d -modeltest -qabstractbutton -qabstractitemview -#qabstractprintdialog NO PRINTING SUPPORT -qabstractproxymodel -qabstractscrollarea -qabstractslider -qabstractspinbox -qabstracttextdocumentlayout -#qaccessibility Requires sql support -> disabled for now -#qaccessibility_mac -qaction -qactiongroup -qapplication cetest-subdir: test -qboxlayout -qbrush -qbuttongroup -qcalendarwidget -qcheckbox -qclipboard cetest-subdir: test -qcolor -qcolordialog -qcolumnview -qcombobox -qcommandlinkbutton -qcompleter -qcomplextext -#qcopchannel QCOP NOT SUPPORTED -qcssparser -qdatawidgetmapper -qdatetimeedit -qdesktopservices -qdesktopwidget -qdial -qdialog -qdialogbuttonbox -#qdirectpainter cetest-subdir: test TEST IS FOR EMBEDDED LINUX ONLY -qdirmodel -qdockwidget -qdoublespinbox -qdoublevalidator -qdrag -qerrormessage -qfiledialog -qfileiconprovider -qfilesystemmodel -qfocusevent -qfocusframe -qfont -qfontcombobox -qfontdatabase -qfontdialog -qfontmetrics -qformlayout -qgraphicsgridlayout -qgraphicsitem -qgraphicsitemanimation -qgraphicslayout -qgraphicslayoutitem -qgraphicslinearlayout -qgraphicsobject -qgraphicspixmapitem -qgraphicspolygonitem -qgraphicsproxywidget -qgraphicsscene -qgraphicsview -qgraphicswidget -qgridlayout -qgroupbox -qguivariant -qheaderview -qicoimageformat -qicon -qimage -qimageiohandler -qimagereader -qimagewriter -qinputcontext -qinputdialog -qintvalidator -qitemdelegate -qitemeditorfactory -qitemmodel -qitemselectionmodel -qitemview -qkeysequence -qlabel -qlayout -qlcdnumber -qlineedit -qlistview -qlistwidget -#qmacstyle -qmainwindow -#qmdiarea Not relevant for S60, skip for now -#qmdisubwindow not relevant for S60, skip for now -qmenu -qmenubar -qmessagebox -qmouseevent -qmouseevent_modal -qmovie -qmultiscreen -qpaintengine -qpainter -qpainterpath -qpainterpathstroker -qpalette -qpathclipper -qpen -qpicture -qpixmap -qpixmapcache -qpixmapfilter -qplaintextedit -#qprinter NO PRINTING SUPPORT ON SYMBIAN YET -#qprinterinfo -qprogressbar -qprogressdialog -qpushbutton -qradiobutton -qregexpvalidator -qregion -qscrollarea -qscrollbar -qshortcut -qsidebar -qsizegrip -qslider -qsortfilterproxymodel -qsound -qspinbox -qsplitter -qstackedlayout -qstackedwidget -qstandarditem -qstandarditemmodel -qstatusbar -qstringlistmodel -qstyle -qstyleoption -qstylesheetstyle -qsyntaxhighlighter -#qsystemtrayicon not relevant for s60, skip for now -qtabbar -qtableview -qtablewidget -qtabwidget -qtessellator -qtextblock -qtextbrowser -qtextcursor -qtextdocument -qtextdocumentfragment -qtextdocumentlayout -qtextedit -qtextformat -qtextlayout -qtextlist -qtextobject -qtextodfwriter -#This test can only be compiled on HW currently, because it does not use reduced exports -#Because we are planning to use class level exports also in HW later on, there is no -#sense to enable this at all -#qtextpiecetable -qtextscriptengine -qtexttable -qtoolbar -qtoolbox -qtoolbutton -qtooltip -qtouchevent -qtransform -qtransformedscreen -qtreeview -qtreewidget -qtreewidgetitemiterator -qtwidgets -qundogroup -qundostack -qwidget -qwidgetaction -qwidget_window -qwindowsurface -qwizard -qwmatrix -qworkspace -qwsembedwidget -qwsinputmethod -qwswindowsystem -qx11info -qzip diff --git a/tests/auto/_Categories/QtHelp.txt b/tests/auto/_Categories/QtHelp.txt deleted file mode 100644 index 89e01fc..0000000 --- a/tests/auto/_Categories/QtHelp.txt +++ /dev/null @@ -1,5 +0,0 @@ -qhelpcontentmodel -qhelpenginecore -qhelpgenerator -qhelpindexmodel -qhelpprojectdata diff --git a/tests/auto/_Categories/QtNetwork.txt b/tests/auto/_Categories/QtNetwork.txt deleted file mode 100644 index 30645d7..0000000 --- a/tests/auto/_Categories/QtNetwork.txt +++ /dev/null @@ -1,33 +0,0 @@ -networkselftest -#qsocketnotifier -qabstractnetworkcache -qabstractsocket -qftp -qhostaddress -qhostinfo -qhttp -qhttpnetworkconnection -qhttpnetworkreply -qhttpsocketengine -qlocalsocket cetest-subdir: test -qnativesocketengine -#requires gui, but is more network test -qnetworkaccessmanager_and_qprogressdialog -qnetworkaddressentry -qnetworkcachemetadata -qnetworkcookie -qnetworkcookiejar -qnetworkdiskcache -qnetworkinterface -qnetworkproxy -qnetworkreply cetest-subdir: test -qnetworkrequest -qsocks5socketengine -qsslcertificate -qsslcipher -qsslerror -qsslkey -qsslsocket -qtcpserver cetest-subdir: test -qtcpsocket cetest-subdir: test -qudpsocket cetest-subdir: test diff --git a/tests/auto/_Categories/QtOpenGl.txt b/tests/auto/_Categories/QtOpenGl.txt deleted file mode 100644 index a4e12ba..0000000 --- a/tests/auto/_Categories/QtOpenGl.txt +++ /dev/null @@ -1 +0,0 @@ -qgl \ No newline at end of file diff --git a/tests/auto/_Categories/QtScript.txt b/tests/auto/_Categories/QtScript.txt deleted file mode 100644 index 3b7e79a..0000000 --- a/tests/auto/_Categories/QtScript.txt +++ /dev/null @@ -1,12 +0,0 @@ -qscriptable -qscriptclass -qscriptcontext -qscriptcontextinfo -qscriptengine -qscriptengineagent -#qscriptenginedebugger does not compile, requires QtScriptTools.lib -qscriptjstestsuite -qscriptstring -qscriptv8testsuite -qscriptvalue -qscriptvalueiterator diff --git a/tests/auto/_Categories/QtSql.txt b/tests/auto/_Categories/QtSql.txt deleted file mode 100644 index 4fc1614..0000000 --- a/tests/auto/_Categories/QtSql.txt +++ /dev/null @@ -1,11 +0,0 @@ -qsql -qsqldatabase -qsqldriver -qsqlerror -qsqlfield -qsqlquery -qsqlquerymodel -qsqlrecord -qsqlrelationaltablemodel -qsqltablemodel -qsqlthread diff --git a/tests/auto/_Categories/QtSvg.txt b/tests/auto/_Categories/QtSvg.txt deleted file mode 100644 index 8bd3cb2..0000000 --- a/tests/auto/_Categories/QtSvg.txt +++ /dev/null @@ -1,3 +0,0 @@ -qsvgdevice -qsvggenerator -qsvgrenderer diff --git a/tests/auto/_Categories/QtTest.txt b/tests/auto/_Categories/QtTest.txt deleted file mode 100644 index 082a028..0000000 --- a/tests/auto/_Categories/QtTest.txt +++ /dev/null @@ -1 +0,0 @@ -selftests diff --git a/tests/auto/_Categories/QtUiTools.txt b/tests/auto/_Categories/QtUiTools.txt deleted file mode 100644 index 0df0e3c..0000000 --- a/tests/auto/_Categories/QtUiTools.txt +++ /dev/null @@ -1 +0,0 @@ -uiloader \ No newline at end of file diff --git a/tests/auto/_Categories/QtWebkit.txt b/tests/auto/_Categories/QtWebkit.txt deleted file mode 100644 index 90ea514..0000000 --- a/tests/auto/_Categories/QtWebkit.txt +++ /dev/null @@ -1,5 +0,0 @@ -qwebelement -qwebframe -qwebhistory -qwebhistoryinterface -qwebpage \ No newline at end of file diff --git a/tests/auto/_Categories/QtXml.txt b/tests/auto/_Categories/QtXml.txt deleted file mode 100644 index ec56646..0000000 --- a/tests/auto/_Categories/QtXml.txt +++ /dev/null @@ -1,5 +0,0 @@ -qdom -qxml -qxmlinputsource -qxmlsimplereader -qxmlstream diff --git a/tests/auto/_Categories/QtXmlPatterns.txt b/tests/auto/_Categories/QtXmlPatterns.txt deleted file mode 100644 index 17de3ef..0000000 --- a/tests/auto/_Categories/QtXmlPatterns.txt +++ /dev/null @@ -1,27 +0,0 @@ -checkxmlfiles -patternistexamplefiletree -patternistexamples -patternistheaders -qabstractmessagehandler -qabstracturiresolver -qabstractxmlforwarditerator -qabstractxmlnodemodel -qabstractxmlreceiver -qapplicationargumentparser -qautoptr -qsimplexmlnodemodel -qsourcelocation -qtokenautomaton -qxmlformatter -qxmlitem -qxmlname -qxmlnamepool -qxmlnodemodelindex -qxmlquery -qxmlresultitems -qxmlserializer -xmlpatterns -xmlpatternsdiagnosticsts -xmlpatternsview -xmlpatternsxqts -xmlpatternsxslts diff --git a/tests/auto/_Categories/all_categories.txt b/tests/auto/_Categories/all_categories.txt deleted file mode 100644 index cc31f4b..0000000 --- a/tests/auto/_Categories/all_categories.txt +++ /dev/null @@ -1,16 +0,0 @@ -#unsorted - -atwrapper -bic -compile -compilerwarnings -headers -macgui -macplist -symbols -uiloader -moc -rcc -uic -uic3 -qmake \ No newline at end of file diff --git a/tests/auto/_Categories/phonon.txt b/tests/auto/_Categories/phonon.txt deleted file mode 100644 index 67911b3..0000000 --- a/tests/auto/_Categories/phonon.txt +++ /dev/null @@ -1,2 +0,0 @@ -mediaobject -mediaobject_wince_ds9 diff --git a/tests/auto/_Categories/qmake.txt b/tests/auto/_Categories/qmake.txt deleted file mode 100644 index 8fa141f..0000000 --- a/tests/auto/_Categories/qmake.txt +++ /dev/null @@ -1 +0,0 @@ -qmake \ No newline at end of file diff --git a/tests/auto/autobuildruncategory.bat b/tests/auto/autobuildruncategory.bat deleted file mode 100644 index 3f434ee..0000000 --- a/tests/auto/autobuildruncategory.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -REM Compile all test cases from given category file - -REM Create root directory for autotest results -IF NOT EXIST %3 MKDIR %3 - -REM Set Module variable -FOR /F %%i IN ("%1") DO SET MODULE=%%~ni - -REM run single test -FOR /F "eol=# tokens=1*" %%i in (%1) do CALL autobuildrunsingle.bat %2 %%i %3 %4 %%j %%k diff --git a/tests/auto/autobuildrunsingle.bat b/tests/auto/autobuildrunsingle.bat deleted file mode 100644 index adb9871..0000000 --- a/tests/auto/autobuildrunsingle.bat +++ /dev/null @@ -1,71 +0,0 @@ -@echo off -REM runtest - -SET QTVERSION=%4 - -IF %1 == winscw goto winscw: -IF %1 == armv5 goto armv5: -IF %1 == gcce goto gcce: -goto end: - -:winscw -IF EXIST \epoc32\release\winscw\udeb\tst_%2.exe ( - call \epoc32\release\winscw\udeb\tst_%2.exe -lightxml - if ERRORLEVEL 1 ( - echo ^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^^^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^^^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^ >> \Epoc32\winscw\c\system\data\out.txt ) - copy /Y \Epoc32\winscw\c\system\data\out.txt %3\%2.xml - goto end: -) ELSE ( -goto notExist: -) - -:ARMV5 -IF EXIST \epoc32\release\armv5\urel\tst_%2.exe ( - pushd . - cd %2 - IF _%5 == _cetest-subdir: ( - echo Running cetest from subdir: %6 - cd %6 - ) - IF _%5 == _cetest-pro: ( - call cetest -release -f %6 -project-delete -lightxml -o %3\%2.xml - ) ELSE ( - call cetest -release -project-delete -lightxml -o %3\%2.xml - ) - if EXIST %3\%2.xml if ERRORLEVEL 1 ( - echo ^ >> %3\%2.xml - echo ^ >> %3\%2.xml - echo ^^^ >> %3\%2.xml - echo ^^^ >> %3\%2.xml - echo ^ >> %3\%2.xml - echo ^ >> %3\%2.xml - ) - popd - goto end: -) ELSE ( -goto notExist: -) - -:gcce -goto end: - -:notExist -echo AAA: %3\%2.xml -echo ^ >> %3\%2.xml -echo ^%QTVERSION%^ >> %3\%2.xml -echo ^%QTVERSION%^ >> %3\%2.xml -echo ^ >> %3\%2.xml -echo ^ >> %3\%2.xml -echo ^ >> %3\%2.xml -echo ^^^ >> %3\%2.xml -echo ^^^ >> %3\%2.xml -echo ^ >> %3\%2.xml -echo ^ >> %3\%2.xml -goto end: - -:end diff --git a/tests/auto/autobuildtests.bat b/tests/auto/autobuildtests.bat deleted file mode 100644 index 55ffad7..0000000 --- a/tests/auto/autobuildtests.bat +++ /dev/null @@ -1,19 +0,0 @@ -@echo off -REM NOTE: If this script is modified, it is likely that next automatic test will fail horribly, -REM unless manual pull from repository is done before running it. - - -REM Sync git -cd ..\..\ -call git clean -dfx -//call git reset --hard -call git pull - - -REM Auto tests builder -REM 1. argument is enviroment: wincw, armv5 or gcce -REM 2. argument is result's path: like \autotestResults -REM 3. argument is path to pscp.exe: like c:\ - -call tests\auto\autobuildtestsmain.bat %1 %2 %3 - diff --git a/tests/auto/autobuildtestsmain.bat b/tests/auto/autobuildtestsmain.bat deleted file mode 100644 index 33ccd15..0000000 --- a/tests/auto/autobuildtestsmain.bat +++ /dev/null @@ -1,38 +0,0 @@ -@echo off -SET QTVERSION=4.4.2 - -IF NOT EXIST %2\result\sent MKDIR %2\result\sent - -REM Delete old results -del /Q %2\*.* - -REM Build enviroment -set path=%cd%\bin;%path% -make confclean -configure -cetest -platform win32-mwc -xplatform symbian-abld -openssl-linked -qconfig symbian -call bldmake bldfiles -call abld clean -call abld reallyclean -IF %1 == winscw call abld build winscw udeb -IF %1 == armv5 call abld build armv5 urel -IF %1 == gcce call abld build gcce urel - -REM Build auto tests -cd \qts60\tests\auto -for %%i in (QtCore QtGui QtNetwork QtXml QtSvg QtScript) do call compilecategory.bat _Categories\%%i.txt %1 - - -REM run auto tests -cd \qts60\tests\auto -for %%i in (QtCore QtGui QtNetwork QtXml QtSvg QtScript) do call autobuildruncategory.bat _Categories\%%i.txt %1 %2 %QTVERSION% - -REM Collect test results -cd \qts60\tests\auto -echo call python joinresults.py %1 %2 %QTVERSION% -call python joinresults.py %1 %2 %QTVERSION% - -REM send the result file -call %3pscp.exe -i "%USERPROFILE%\.ssh\puttyssh.ppk" %2\Result\*.xml qtestmaster@kramer-nokia.troll.no:/home/qtestmaster/results - -REM Copy the result file to different directory that it not sent again -move %2\Result\*.xml %2\Result\sent diff --git a/tests/auto/compilecategory.bat b/tests/auto/compilecategory.bat deleted file mode 100644 index 59e31b5..0000000 --- a/tests/auto/compilecategory.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM Compile all test cases from given gategory file - -FOR /F "eol=# tokens=1*" %%i in (%1) do CALL compilesingle.bat %%i %2 diff --git a/tests/auto/compilesingle.bat b/tests/auto/compilesingle.bat deleted file mode 100644 index a9bb5f4..0000000 --- a/tests/auto/compilesingle.bat +++ /dev/null @@ -1,28 +0,0 @@ -@echo off -REM Compile test case from folder as a parameter - -pushd . -cd %1 -REM call abld reallyclean -call qmake -r -call bldmake bldfiles - -REM reallyclean is not always deleting executables for some reason, so do that explicitly before building - -IF %2 == winscw ( -call abld reallyclean winscw -call del /q /f \epoc32\release\winscw\udeb\tst_%1.exe -call abld build winscw udeb -) -IF %2 == armv5 ( -call abld reallyclean armv5 -call del /q /f \epoc32\release\armv5\urel\tst_%1.exe -call abld build armv5 urel -) -IF %2 == gcce ( -call abld reallyclean gcce -call del /q /f \epoc32\release\gcce\urel\tst_%1.exe -call abld build gcce urel -) - -popd \ No newline at end of file -- cgit v0.12 From a13187c486269417455b5b1db49ffab24e8be767 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 15 Aug 2009 16:51:50 +0200 Subject: Fixed a compile error for qs60style.cpp on s60 build. --- src/gui/styles/qs60style.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 1226e22..0efc5b4 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1636,7 +1636,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, if (optionProgressBar->minimum == optionProgressBar->maximum && optionProgressBar->minimum == 0) { // busy indicator - const int orientationFlag = optionProgressBar->orientation == Qt::Horizontal ? + const QS60StylePrivate::SkinElementFlag orientationFlag = optionProgressBar->orientation == Qt::Horizontal ? QS60StylePrivate::SF_PointNorth : QS60StylePrivate::SF_PointWest; QS60StylePrivate::drawSkinPart(QS60StyleEnums::SP_QgnGrafBarWait, painter, progressRect, flags | orientationFlag); } else { -- cgit v0.12 From 87ec7c9d481979c0e04ba50c79534a8b7a445332 Mon Sep 17 00:00:00 2001 From: axis Date: Wed, 12 Aug 2009 10:52:32 +0200 Subject: Fix the cursor lagging one step behind in the Virtual Keyboard UI. This was caused by the widget not calling update on the input context after changes to the cursor position. This is a reimplementation of 8d1691e9395, after the QLineControl refactoring. RevBy: Trust me AutoTest: Passed --- src/gui/widgets/qlineedit_p.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp index d907233..16b28a1 100644 --- a/src/gui/widgets/qlineedit_p.cpp +++ b/src/gui/widgets/qlineedit_p.cpp @@ -154,6 +154,8 @@ void QLineEditPrivate::init(const QString& txt) QObject::connect(control, SIGNAL(editFocusChange(bool)), q, SLOT(_q_editFocusChange(bool))); #endif + QObject::connect(control, SIGNAL(cursorPositionChanged(int, int)), + q, SLOT(updateMicroFocus())); // for now, going completely overboard with updates. QObject::connect(control, SIGNAL(selectionChanged()), -- cgit v0.12 From 5e3dd575014c11f13b7d1c056a13cc103ff96b0d Mon Sep 17 00:00:00 2001 From: axis Date: Mon, 17 Aug 2009 08:50:54 +0200 Subject: Changed to SymbianVersion enum after review. RevBy: Trust me AutoTest: It built... --- src/corelib/global/qglobal.cpp | 14 +++++++------- src/corelib/global/qglobal.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 6d88c91..a8c46f5 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1060,7 +1060,7 @@ bool qSharedBuild() */ /*! - \fn QSysInfo::SymVersion QSysInfo::symbianVersion() + \fn QSysInfo::SymbianVersion QSysInfo::symbianVersion() Returns the version of the Symbian operating system on which the application is run (Symbian only). @@ -1129,7 +1129,7 @@ bool qSharedBuild() \value WV_NT_based NT-based version of Windows \value WV_CE_based CE-based version of Windows - \sa MacVersion, SymVersion + \sa MacVersion, SymbianVersion */ /*! @@ -1158,11 +1158,11 @@ bool qSharedBuild() \value MV_LEOPARD Apple codename for MV_10_5 \value MV_SNOWLEOPARD Apple codename for MV_10_6 - \sa WinVersion, SymVersion + \sa WinVersion, SymbianVersion */ /*! - \enum QSysInfo::SymVersion + \enum QSysInfo::SymbianVersion This enum provides symbolic names for the various versions of the Symbian operating system. On Symbian, the @@ -1190,7 +1190,7 @@ bool qSharedBuild() \value SV_S60_5_0 S60 5th Edition \value SV_S60_Unknown An unknown and currently unsupported platform - \sa SymVersion, WinVersion, MacVersion + \sa SymbianVersion, WinVersion, MacVersion */ /*! @@ -1812,7 +1812,7 @@ QSysInfo::S60Version QSysInfo::s60Version() return cachedS60Version = SV_S60_Unknown; # endif } -QSysInfo::SymVersion QSysInfo::symbianVersion() +QSysInfo::SymbianVersion QSysInfo::symbianVersion() { switch (s60Version()) { case SV_S60_3_1: @@ -1831,7 +1831,7 @@ QSysInfo::S60Version QSysInfo::s60Version() return SV_S60_None; } -QSysInfo::SymVersion QSysInfo::symbianVersion() +QSysInfo::SymbianVersion QSysInfo::symbianVersion() { return SV_Unknown; } diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index b4ae2dc..d6ec7dd 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1472,13 +1472,13 @@ public: static const MacVersion MacintoshVersion; #endif #ifdef Q_OS_SYMBIAN - enum SymVersion { + enum SymbianVersion { SV_Unknown = 0x0000, SV_9_2 = 0x0001, SV_9_3 = 0x0002, SV_9_4 = 0x0004 }; - static SymVersion symbianVersion(); + static SymbianVersion symbianVersion(); enum S60Version { SV_S60_None = 0x0000, SV_S60_Unknown = 0x0001, -- cgit v0.12 From d24029e3d4639f1300e7a68858936911df969f69 Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Mon, 17 Aug 2009 15:00:55 +0200 Subject: rename QLockedMutexUnlocker to QMutexUnlocker Reviewed-by: Marius Storm-Olsen --- src/corelib/kernel/qcoreapplication.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 4a4817d..4e9096a 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -96,17 +96,17 @@ QT_BEGIN_NAMESPACE -class QLockedMutexUnlocker +class QMutexUnlocker { public: - inline explicit QLockedMutexUnlocker(QMutex *m) + inline explicit QMutexUnlocker(QMutex *m) : mtx(m) { } - inline ~QLockedMutexUnlocker() { unlock(); } + inline ~QMutexUnlocker() { unlock(); } inline void unlock() { if (mtx) mtx->unlock(); mtx = 0; } private: - Q_DISABLE_COPY(QLockedMutexUnlocker) + Q_DISABLE_COPY(QMutexUnlocker) QMutex *mtx; }; @@ -1106,7 +1106,7 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event, int priority) data->postEventList.mutex.lock(); } - QLockedMutexUnlocker locker(&data->postEventList.mutex); + QMutexUnlocker locker(&data->postEventList.mutex); // if this is one of the compressible events, do compression if (receiver->d_func()->postedEvents -- cgit v0.12 From 3a2d02f3a8f02509023dd398da77f35b9b3ad68f Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Mon, 17 Aug 2009 19:53:45 +0200 Subject: Use qt_TDesC2QString() instead qstringFromDesc(). That way we will avoid duplicated functionality. --- src/network/kernel/qnetworkinterface_symbian.cpp | 26 ++++++++++-------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/network/kernel/qnetworkinterface_symbian.cpp b/src/network/kernel/qnetworkinterface_symbian.cpp index 717d80d..2ba5350 100644 --- a/src/network/kernel/qnetworkinterface_symbian.cpp +++ b/src/network/kernel/qnetworkinterface_symbian.cpp @@ -43,6 +43,7 @@ #include "qnetworkinterface.h" #include "qnetworkinterface_p.h" +#include "../corelib/kernel/qcore_symbian_p.h" #ifndef QT_NO_NETWORKINTERFACE @@ -66,11 +67,6 @@ static QNetworkInterface::InterfaceFlags convertFlags(const TSoInetInterfaceInfo return flags; } -QString qstringFromDesc(const TDesC& aData) -{ - return QString::fromUtf16(aData.Ptr(), aData.Length()); -} - static QList interfaceListing() { TInt err(KErrNone); @@ -111,7 +107,7 @@ static QList interfaceListing() iface = new QNetworkInterfacePrivate; iface->index = ifindex++; interfaces << iface; - iface->name = qstringFromDesc(info.iName); + iface->name = qt_TDesC2QString(info.iName); iface->flags = convertFlags(info); if (/*info.iFeatures&KIfHasHardwareAddr &&*/ info.iHwAddr.Family() != KAFUnspec) { @@ -121,37 +117,37 @@ static QList interfaceListing() address.Append(_L(":")); } address.UpperCase(); - iface->hardwareAddress = qstringFromDesc(address); + iface->hardwareAddress = qt_TDesC2QString(address); } // Get the address of the interface info.iAddress.Output(address); - entry.setIp(QHostAddress(qstringFromDesc(address))); + entry.setIp(QHostAddress(qt_TDesC2QString(address))); // Get the interface netmask // For some reason netmask is always 0.0.0.0 // info.iNetMask.Output(address); - // entry.setNetmask( QHostAddress( qstringFromDesc( address ) ) ); + // entry.setNetmask( QHostAddress( qt_TDesC2QString( address ) ) ); // Workaround: Let Symbian determine netmask based on IP address class // TODO: Works only for IPv4 - Task: 259128 Implement IPv6 support TInetAddr netmask; netmask.NetMask(info.iAddress); netmask.Output(address); - entry.setNetmask(QHostAddress(qstringFromDesc(address))); + entry.setNetmask(QHostAddress(qt_TDesC2QString(address))); // Get the interface broadcast address if (iface->flags & QNetworkInterface::CanBroadcast) { // For some reason broadcast address is always 0.0.0.0 // info.iBrdAddr.Output(address); - // entry.setBroadcast( QHostAddress( qstringFromDesc( address ) ) ); + // entry.setBroadcast( QHostAddress( qt_TDesC2QString( address ) ) ); // Workaround: Let Symbian determine broadcast address based on IP address // TODO: Works only for IPv4 - Task: 259128 Implement IPv6 support TInetAddr broadcast; broadcast.NetBroadcast(info.iAddress); broadcast.Output(address); - entry.setBroadcast(QHostAddress(qstringFromDesc(address))); + entry.setBroadcast(QHostAddress(qt_TDesC2QString(address))); } // Add new entry to interface address entries @@ -193,12 +189,12 @@ static QList interfaceListing() // get interface address routeInfo.iIfAddr.Output(address); - QHostAddress ifAddr(qstringFromDesc(address)); + QHostAddress ifAddr(qt_TDesC2QString(address)); if (ifAddr.isNull()) continue; routeInfo.iDstAddr.Output(address); - QHostAddress destination(qstringFromDesc(address)); + QHostAddress destination(qt_TDesC2QString(address)); if (destination.isNull() || destination != ifAddr) continue; @@ -215,7 +211,7 @@ static QList interfaceListing() continue; } else { routeInfo.iNetMask.Output(address); - QHostAddress netmask(qstringFromDesc(address)); + QHostAddress netmask(qt_TDesC2QString(address)); entry.setNetmask(netmask); // NULL boradcast address for // ::postProcess to have effect -- cgit v0.12