diff options
Diffstat (limited to 'src')
| -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 |
3 files changed, 7 insertions, 1 deletions
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); } |