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>

diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 67b6954..a941c06 100644 (file)
--- 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)

diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
index bf60be6..1ed28b8 100644 (file)
--- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
+++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
@@ -138,9 +138,9 @@ void QPlatformPrinterSupport::setPrinterInfoCupsPrinterIndex(QPrinterInfo *p, in
     Converts QSizeF in millimeters to a predefined PaperSize (returns Custom if
     the size isn't a standard size)
 */
+extern QPrinter::PaperSize qSizeFTopaperSize(const QSizeF &);
 QPrinter::PaperSize QPlatformPrinterSupport::convertQSizeFToPaperSize(const QSizeF &sizef)
 {
-    extern QPrinter::PaperSize qSizeFTopaperSize(const QSizeF &);
     return qSizeFTopaperSize(sizef);
 }
 
@@ -148,9 +148,9 @@ QPrinter::PaperSize QPlatformPrinterSupport::convertQSizeFToPaperSize(const QSiz
     Converts a predefined PaperSize to a QSizeF in millimeters (returns
     QSizeF(0.0, 0.0) if PaperSize is Custom)
 */
+extern QSizeF qt_paperSizeToQSizeF(QPrinter::PaperSize size);
 QSizeF QPlatformPrinterSupport::convertPaperSizeToQSizeF(QPrinter::PaperSize paperSize)
 {
-    extern QSizeF qt_paperSizeToQSizeF(QPrinter::PaperSize size);
     return qt_paperSizeToQSizeF(paperSize);
 }