diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-05-02 10:31:11 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 03:20:53 +0200 |
| commit | 6b98bf6a142002f27469d94ef489c3e081936a76 (patch) | |
| tree | 420d9f5941a02f0be11eecb185d95649240fd656 /src/gui | |
| parent | 74c3517e6afb07ae82fa5b28968a5f18819ea943 (diff) | |
Fixed QtGui and QtPrintSupport with -qtnamespace and MSVC
With this compiler, external functions declared inside other functions
will end up in the wrong namespace.
Change-Id: Ia37283d632dbc2ee0c269aeffa1f045b3e60148e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/util/qdesktopservices.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index 67b695424b..a941c06031 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -284,6 +284,7 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme) Use QStandardPaths::displayName() */ +extern Q_CORE_EXPORT QString qt_applicationName_noFallback(); QString QDesktopServices::storageLocationImpl(QStandardPaths::StandardLocation type) { @@ -291,7 +292,6 @@ QString QDesktopServices::storageLocationImpl(QStandardPaths::StandardLocation t // Preserve Qt 4 compatibility: // * QCoreApplication::applicationName() must default to empty // * Unix data location is under the "data/" subdirectory - extern Q_CORE_EXPORT QString qt_applicationName_noFallback(); const QString compatAppName = qt_applicationName_noFallback(); const QString baseDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); #if defined(Q_OS_WIN) || defined(Q_OS_MAC) |