From 63569a68d2fd5ca90c4660e632fba2f3f3b37d73 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sat, 29 Dec 2012 02:09:39 +0800 Subject: Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtCore -> Qt Core QtDBus -> Qt D-Bus QtDesigner -> Qt Designer QtGui -> Qt GUI QtImageFormats -> Qt Image Formats QtNetwork -> Qt Network QtPrintSupport -> Qt Print Support QtScript -> Qt Script QtSql -> Qt SQL QtSvg -> Qt SVG QtTest -> Qt Test QtWebKit -> Qt WebKit QtWidgets -> Qt Widgets QtXml -> Qt XML QtConcurrent -> Qt Concurrent (partial) QtQuick -> Qt Quick (partial) Also, distinguish between "module" and "library" Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd Reviewed-by: Jerome Pasion --- src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm | 2 +- src/plugins/platforms/cocoa/qcocoamenuloader.mm | 2 +- src/plugins/platforms/cocoa/qcocoanativeinterface.h | 2 +- src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 2 +- src/plugins/platforms/windows/qwindowsfontengine.h | 2 +- src/plugins/platforms/windows/qwindowsintegration.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm index 305e7ff985..a0734530c5 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm @@ -881,7 +881,7 @@ void QCocoaEventDispatcherPrivate::cleanupModalSessions() void QCocoaEventDispatcherPrivate::beginModalSession(QWindow *window) { // We need to start spinning the modal session. Usually this is done with - // QDialog::exec() for QtWidgets based applications, but for others that + // QDialog::exec() for Qt Widgets based applications, but for others that // just call show(), we need to interrupt(). We call this here, before // setting currentModalSessionCached to zero, so that interrupt() calls // [NSApp abortModal] if another modal session is currently running diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm index 60bcd82aae..2a9dcec64b 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm @@ -88,7 +88,7 @@ QString qt_mac_applicationmenu_string(int type) The reason for having the nib file is that those can not be created programmatically. To ease deployment the nib files are stored in Qt resources and written to QDir::temp() before loading. (Earlier Qt versions used - to require having the nib file in the QtGui framework.) + to require having the nib file in the Qt GUI framework.) */ void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader) { diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h index 825f88a269..34e8fb61e2 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h @@ -82,7 +82,7 @@ private: Q_INVOKABLE QPlatformPrinterSupport *createPlatformPrinterSupport(); /* Function to return the NSPrintInfo * from QMacPaintEnginePrivate. - Needed by the native print dialog in the QtPrintSupport library. + Needed by the native print dialog in the Qt Print Support module. */ Q_INVOKABLE void *NSPrintInfoForPrintEngine(QPrintEngine *printEngine); diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index 2d68c4684a..b4fb19e8e8 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -1141,7 +1141,7 @@ QWindowsFontEngineDataPtr sharedFontData() QWindowsFontDatabase::QWindowsFontDatabase() { - // Properties accessed by QWin32PrintEngine (QtPrintSupport) + // Properties accessed by QWin32PrintEngine (Qt Print Support) static const int hfontMetaTypeId = qRegisterMetaType(); static const int logFontMetaTypeId = qRegisterMetaType(); Q_UNUSED(hfontMetaTypeId) diff --git a/src/plugins/platforms/windows/qwindowsfontengine.h b/src/plugins/platforms/windows/qwindowsfontengine.h index cfe1acf3a7..a23db2f235 100644 --- a/src/plugins/platforms/windows/qwindowsfontengine.h +++ b/src/plugins/platforms/windows/qwindowsfontengine.h @@ -135,7 +135,7 @@ public: const QSharedPointer &fontEngineData() const { return m_fontEngineData; } - // Properties accessed by QWin32PrintEngine (QtPrintSupport) + // Properties accessed by QWin32PrintEngine (Qt Print Support) LOGFONT logFont() const { return m_logfont; } HFONT hFont() const { return hfont; } bool trueType() const { return ttf; } diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index af5f94870f..aac28c36dc 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -414,10 +414,10 @@ QPlatformOpenGLContext #ifdef Q_OS_WINCE // It's not easy to detect if we are running a QML application -// Let's try to do so by checking if the QtQuick module is loaded. +// Let's try to do so by checking if the Qt Quick module is loaded. inline bool isQMLApplication() { - // check if the QtQuick library is loaded + // check if the Qt Quick module is loaded #ifdef _DEBUG HMODULE handle = GetModuleHandle(L"Qt5Quick" QT_LIBINFIX L"d.dll"); #else -- cgit v1.2.3