diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-26 19:49:04 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-08-04 12:50:12 -0700 |
| commit | a8ebadac593572601adff912ca12047c5a980371 (patch) | |
| tree | 0c213efbf731116ec997763e04e377e3fd68263b /src/printsupport | |
| parent | d2fcccd3f1c5e3729c280a6f0a3e12dc9835477b (diff) | |
Fix several more improperly placed #include moc
Like commit qtbase/638893bea083b619b73b33a7dd5589fb2c4c4242.
Script to find them:
git grep -l '#include.*moc' \*.cpp \*.mm | \
xargs awk '/QT_BEGIN_NAMESPACE/ { i=1 } /QT_END_NAMESPACE/ { i=0 } /#include.*moc/ && i { print ARGV[ARGIND], $0 }'
Pick-to: 6.4
Change-Id: I6f936da6f6e84d649f70fffd17058fd05cfc5c6d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/kernel/qplatformprintplugin.cpp | 8 | ||||
| -rw-r--r-- | src/printsupport/platform/macos/qcocoaprintersupport.mm | 4 | ||||
| -rw-r--r-- | src/printsupport/platform/windows/qwindowsprintersupport.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp index 79aaa5bb3c..c48e5f65bf 100644 --- a/src/printsupport/kernel/qplatformprintplugin.cpp +++ b/src/printsupport/kernel/qplatformprintplugin.cpp @@ -10,16 +10,16 @@ #ifndef QT_NO_PRINTER -QT_BEGIN_NAMESPACE - -using namespace Qt::StringLiterals; - #if defined(Q_OS_MACOS) Q_IMPORT_PLUGIN(QCocoaPrinterSupportPlugin) #elif defined(Q_OS_WIN) Q_IMPORT_PLUGIN(QWindowsPrinterSupportPlugin) #endif +QT_BEGIN_NAMESPACE + +using namespace Qt::StringLiterals; + Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QPlatformPrinterSupportFactoryInterface_iid, "/printsupport"_L1, Qt::CaseInsensitive)) diff --git a/src/printsupport/platform/macos/qcocoaprintersupport.mm b/src/printsupport/platform/macos/qcocoaprintersupport.mm index 3570255529..ed03e87f29 100644 --- a/src/printsupport/platform/macos/qcocoaprintersupport.mm +++ b/src/printsupport/platform/macos/qcocoaprintersupport.mm @@ -94,8 +94,8 @@ QPlatformPrinterSupport *QCocoaPrinterSupportPlugin::create(const QString &key) return new QCocoaPrinterSupport(); } -#include "qcocoaprintersupport.moc" - QT_END_NAMESPACE +#include "qcocoaprintersupport.moc" + #endif //QT_NO_PRINTER diff --git a/src/printsupport/platform/windows/qwindowsprintersupport.cpp b/src/printsupport/platform/windows/qwindowsprintersupport.cpp index db55573a0b..7cbd4dc491 100644 --- a/src/printsupport/platform/windows/qwindowsprintersupport.cpp +++ b/src/printsupport/platform/windows/qwindowsprintersupport.cpp @@ -69,8 +69,8 @@ QPlatformPrinterSupport *QWindowsPrinterSupportPlugin::create(const QString &key return nullptr; } -#include "qwindowsprintersupport.moc" - QT_END_NAMESPACE +#include "qwindowsprintersupport.moc" + #endif // QT_NO_PRINTER |