diff options
| author | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-09-13 09:24:58 (GMT) |
|---|---|---|
| committer | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-09-13 09:24:58 (GMT) |
| commit | cb7c3b8f837d123cef1a180b700b53869cc77ea6 (patch) | |
| tree | 339887db1cbe14430f19d1d60b6d2f375987d598 | |
| parent | 6d408941774f60d79c8d1e3fd1131c5572de51c3 (diff) | |
| parent | 7042610c090d12de5cd893800dfea199c9a3d332 (diff) | |
| download | Qt-cb7c3b8f837d123cef1a180b700b53869cc77ea6.zip Qt-cb7c3b8f837d123cef1a180b700b53869cc77ea6.tar.gz Qt-cb7c3b8f837d123cef1a180b700b53869cc77ea6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 1 | ||||
| -rw-r--r-- | src/gui/util/qdesktopservices.cpp | 3 | ||||
| -rw-r--r-- | src/qbase.pri | 3 | ||||
| -rw-r--r-- | src/tools/moc/generator.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qcolumnview/tst_qcolumnview.cpp | 1 |
5 files changed, 9 insertions, 1 deletions
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/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) 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 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); } 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) |