From 52df38bfba06358fbe8bf648e03eb0c95ceff114 Mon Sep 17 00:00:00 2001 From: Juha Kukkonen Date: Thu, 1 Sep 2011 12:44:45 +0300 Subject: Fix QColumnView auto test failure Changed scrollTo test to wait until animation is finished before checking horizontalOffset. Task-number: QTTH-1461 Reviewed-by: Miikka Heikkinen --- tests/auto/qcolumnview/tst_qcolumnview.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp index 7f6d43a..65e23bf 100644 --- a/tests/auto/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp @@ -461,6 +461,7 @@ void tst_QColumnView::scrollTo() view.setCurrentIndex(index); QTest::qWait(ANIMATION_DELAY); view.scrollTo(index, QAbstractItemView::EnsureVisible); + QTest::qWait(ANIMATION_DELAY); index = index.parent(); if (start != level) { if (!reverse) -- cgit v0.12 From b1696fab84c411da025d255fef82f64c78bd92b5 Mon Sep 17 00:00:00 2001 From: Pasi Pentikainen Date: Tue, 6 Sep 2011 17:40:40 +0300 Subject: Add a cast to moc cpp generator to remove armcc warnings Task-number: QT-3869 Reviewed-by: Murray Read --- src/tools/moc/generator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 72fda2d..b1bcab7 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -574,7 +574,7 @@ void Generator::generateProperties() strreg(p.name), strreg(p.type)); if (!(flags >> 24) && isQRealType(p.type)) - fprintf(out, "(QMetaType::QReal << 24) | "); + fprintf(out, "((uint)QMetaType::QReal << 24) | "); fprintf(out, "0x%.8x,\n", flags); } -- cgit v0.12 From a53e1a2bea83057aade9a4ffd0210040802b9595 Mon Sep 17 00:00:00 2001 From: Pasi Pentikainen Date: Mon, 12 Sep 2011 12:15:20 +0300 Subject: Mark binaries as SMPSAFE in Symbian Task-number: QTBUG-11769 Reviewed-by: Laszlo Agocs --- mkspecs/features/qttest_p4.prf | 1 + src/qbase.pri | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index ede9657..55df04a 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -11,6 +11,7 @@ symbian:{ # DEFINES += QTEST_NO_SPECIALIZATIONS TARGET.CAPABILITY="None" RSS_RULES ="group_name=\"QtTests\";" + MMP_RULES*=SMPSAFE } # prefix test binary with tst_ diff --git a/src/qbase.pri b/src/qbase.pri index c4d081f..632d7f4 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -110,6 +110,9 @@ symbian { # workaround for the fact that some of our required includes in Symbian^3 # now depend upon files in epoc32/include/platform INCLUDEPATH += $$OS_LAYER_SYSTEMINCLUDE + + # All relevant files are marked as SMP safe for the Symbian port + MMP_RULES*=SMPSAFE } win32-borland:INCLUDEPATH += kernel -- cgit v0.12 From 7042610c090d12de5cd893800dfea199c9a3d332 Mon Sep 17 00:00:00 2001 From: Juha Kukkonen Date: Fri, 9 Sep 2011 14:02:55 +0300 Subject: Update QDesktopServices openUrl() documentation on Symbian OS QDesktopServices openUrl() does not reload the given URL if browser is already open unless application has SwEvent capability. Capability is required because this scenario involves sending a message to window group in other process. Task-number: QTBUG-15725 Reviewed-by: Honglei Zhang --- src/gui/util/qdesktopservices.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index e79819e..05a1292 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -177,6 +177,9 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler) Unicode-aware, the user may have configured their client without these features. Also, certain e-mail clients (e.g., Lotus Notes) have problems with long URLs. + \note On Symbian OS, \c SwEvent capability is required to open the given \a url + if the Web browser is already running. + \sa setUrlHandler() */ bool QDesktopServices::openUrl(const QUrl &url) -- cgit v0.12