From 6b98bf6a142002f27469d94ef489c3e081936a76 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 2 May 2012 10:31:11 +1000 Subject: 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 --- src/gui/util/qdesktopservices.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/util/qdesktopservices.cpp') 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) -- cgit v1.2.3