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 }' Change-Id: I6f936da6f6e84d649f70fffd17058fd05cfc5c6d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit a8ebadac593572601adff912ca12047c5a980371) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
5d6bc9140e
commit
afec50df6f
@ -559,6 +559,6 @@ QImage *QCALayerBackingStore::GraphicsBuffer::asImage()
|
|||||||
return &m_image;
|
return &m_image;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "moc_qcocoabackingstore.cpp"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "moc_qcocoabackingstore.cpp"
|
||||||
|
@ -68,8 +68,8 @@ void QCocoaClipboard::handleApplicationStateChanged(Qt::ApplicationState state)
|
|||||||
emitChanged(QClipboard::FindBuffer);
|
emitChanged(QClipboard::FindBuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "moc_qcocoaclipboard.cpp"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "moc_qcocoaclipboard.cpp"
|
||||||
|
|
||||||
#endif // QT_NO_CLIPBOARD
|
#endif // QT_NO_CLIPBOARD
|
||||||
|
@ -793,10 +793,10 @@ QDebug operator<<(QDebug debug, const QCocoaScreen *screen)
|
|||||||
}
|
}
|
||||||
#endif // !QT_NO_DEBUG_STREAM
|
#endif // !QT_NO_DEBUG_STREAM
|
||||||
|
|
||||||
#include "qcocoascreen.moc"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "qcocoascreen.moc"
|
||||||
|
|
||||||
@implementation NSScreen (QtExtras)
|
@implementation NSScreen (QtExtras)
|
||||||
|
|
||||||
- (CGDirectDisplayID)qt_displayId
|
- (CGDirectDisplayID)qt_displayId
|
||||||
|
@ -1953,6 +1953,6 @@ QDebug operator<<(QDebug debug, const QCocoaWindow *window)
|
|||||||
}
|
}
|
||||||
#endif // !QT_NO_DEBUG_STREAM
|
#endif // !QT_NO_DEBUG_STREAM
|
||||||
|
|
||||||
#include "moc_qcocoawindow.cpp"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "moc_qcocoawindow.cpp"
|
||||||
|
@ -332,6 +332,6 @@ bool QIOSContext::isSharing() const
|
|||||||
return m_sharedContext;
|
return m_sharedContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "moc_qioscontext.cpp"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "moc_qioscontext.cpp"
|
||||||
|
@ -287,6 +287,6 @@ void *QIOSIntegration::nativeResourceForWindow(const QByteArray &resource, QWind
|
|||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
#include "moc_qiosintegration.cpp"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "moc_qiosintegration.cpp"
|
||||||
|
@ -530,6 +530,6 @@ UIWindow *QIOSScreen::uiWindow() const
|
|||||||
return m_uiWindow;
|
return m_uiWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "moc_qiosscreen.cpp"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "moc_qiosscreen.cpp"
|
||||||
|
@ -371,6 +371,6 @@ QDebug operator<<(QDebug debug, const QIOSWindow *window)
|
|||||||
}
|
}
|
||||||
#endif // !QT_NO_DEBUG_STREAM
|
#endif // !QT_NO_DEBUG_STREAM
|
||||||
|
|
||||||
#include "moc_qioswindow.cpp"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "moc_qioswindow.cpp"
|
||||||
|
@ -746,6 +746,6 @@ void QQnxScreenEventHandler::timerEvent(QTimerEvent *event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "moc_qqnxscreeneventhandler.cpp"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "moc_qqnxscreeneventhandler.cpp"
|
||||||
|
@ -10,16 +10,16 @@
|
|||||||
|
|
||||||
#ifndef QT_NO_PRINTER
|
#ifndef QT_NO_PRINTER
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
|
||||||
|
|
||||||
using namespace Qt::StringLiterals;
|
|
||||||
|
|
||||||
#if defined(Q_OS_MACOS)
|
#if defined(Q_OS_MACOS)
|
||||||
Q_IMPORT_PLUGIN(QCocoaPrinterSupportPlugin)
|
Q_IMPORT_PLUGIN(QCocoaPrinterSupportPlugin)
|
||||||
#elif defined(Q_OS_WIN)
|
#elif defined(Q_OS_WIN)
|
||||||
Q_IMPORT_PLUGIN(QWindowsPrinterSupportPlugin)
|
Q_IMPORT_PLUGIN(QWindowsPrinterSupportPlugin)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
using namespace Qt::StringLiterals;
|
||||||
|
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
|
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
|
||||||
(QPlatformPrinterSupportFactoryInterface_iid, "/printsupport"_L1, Qt::CaseInsensitive))
|
(QPlatformPrinterSupportFactoryInterface_iid, "/printsupport"_L1, Qt::CaseInsensitive))
|
||||||
|
|
||||||
|
@ -94,8 +94,8 @@ QPlatformPrinterSupport *QCocoaPrinterSupportPlugin::create(const QString &key)
|
|||||||
return new QCocoaPrinterSupport();
|
return new QCocoaPrinterSupport();
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "qcocoaprintersupport.moc"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "qcocoaprintersupport.moc"
|
||||||
|
|
||||||
#endif //QT_NO_PRINTER
|
#endif //QT_NO_PRINTER
|
||||||
|
@ -69,8 +69,8 @@ QPlatformPrinterSupport *QWindowsPrinterSupportPlugin::create(const QString &key
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "qwindowsprintersupport.moc"
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#include "qwindowsprintersupport.moc"
|
||||||
|
|
||||||
#endif // QT_NO_PRINTER
|
#endif // QT_NO_PRINTER
|
||||||
|
Loading…
x
Reference in New Issue
Block a user