10 files changed, 125 insertions, 125 deletions

diff --git a/examples/winextras/dwmfeatures/examplewidget.cpp b/examples/winextras/dwmfeatures/examplewidget.cpp
index 2380e09..afb9e2e 100644
--- a/examples/winextras/dwmfeatures/examplewidget.cpp
+++ b/examples/winextras/dwmfeatures/examplewidget.cpp
@@ -95,29 +95,29 @@ bool ExampleWidget::event(QEvent *e)
 
 void ExampleWidget::onDisallowPeekClicked()
 {
-    QWinExtras::setWindowDisallowPeek(this, ui->btnPeekDisallow->isChecked());
+    QtWinExtras::setWindowDisallowPeek(this, ui->btnPeekDisallow->isChecked());
 }
 
 void ExampleWidget::onExcludeFromPeekClicked()
 {
-    QWinExtras::setWindowExcludedFromPeek(this, ui->btnPeekExclude->isChecked());
+    QtWinExtras::setWindowExcludedFromPeek(this, ui->btnPeekExclude->isChecked());
 }
 
 void ExampleWidget::onFlip3DPolicyChanged()
 {
-    QWinExtras::WindowFlip3DPolicy policy;
+    QtWinExtras::WindowFlip3DPolicy policy;
     if (ui->radioFlipAbove->isChecked())
-        policy = QWinExtras::FlipExcludeAbove;
+        policy = QtWinExtras::FlipExcludeAbove;
     else if (ui->radioFlipBelow->isChecked())
-        policy = QWinExtras::FlipExcludeBelow;
+        policy = QtWinExtras::FlipExcludeBelow;
     else
-        policy = QWinExtras::FlipDefault;
-    QWinExtras::setWindowFlip3DPolicy(this, policy);
+        policy = QtWinExtras::FlipDefault;
+    QtWinExtras::setWindowFlip3DPolicy(this, policy);
 }
 
 void ExampleWidget::onGlassMarginsChanged()
 {
-    if (!QWinExtras::isCompositionEnabled())
+    if (!QtWinExtras::isCompositionEnabled())
         return;
 
     // what you see here is the only way to force widget to redraw itself
@@ -133,7 +133,7 @@ void ExampleWidget::onGlassMarginsChanged()
         resize(modified);
 
         setAttribute(Qt::WA_NoSystemBackground);
-        QWinExtras::extendFrameIntoClientArea(this,
+        QtWinExtras::extendFrameIntoClientArea(this,
                                          ui->frameTop->value(),
                                          ui->frameRight->value(),
                                          ui->frameBottom->value(),
@@ -145,7 +145,7 @@ void ExampleWidget::onGlassMarginsChanged()
         ui->groupBox_3->setAutoFillBackground(true);
         ui->groupBox_4->setAutoFillBackground(true);
     } else {
-        QWinExtras::extendFrameIntoClientArea(this,
+        QtWinExtras::extendFrameIntoClientArea(this,
                                          ui->frameLeft->value(),
                                          ui->frameTop->value(),
                                          ui->frameRight->value(),
@@ -163,7 +163,7 @@ void ExampleWidget::onResetGlassFrameClicked()
     ui->frameBottom->setValue(0);
     ui->frameLeft->setValue(0);
 
-    QWinExtras::resetExtendedFrame(this);
+    QtWinExtras::resetExtendedFrame(this);
     setAttribute(Qt::WA_NoSystemBackground, false);
 
     QSize original = size();
diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp
index 8511ff1..ada2536 100644
--- a/examples/winextras/iconextractor/main.cpp
+++ b/examples/winextras/iconextractor/main.cpp
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 
     imageFileRoot = imageFileRootInfo.absoluteFilePath() + QLatin1Char('/') + QFileInfo(sourceFile).baseName();
     for (UINT i = 0; i < extractedIconCount; ++i) {
-        const QPixmap pixmap = QWinExtras::fromHICON(icons[i]);
+        const QPixmap pixmap = QtWinExtras::fromHICON(icons[i]);
         if (pixmap.isNull()) {
             std::cerr << "Error converting icons.\n";
             return 1;
diff --git a/src/imports/winextras/qquickwindwmfeatures.cpp b/src/imports/winextras/qquickwindwmfeatures.cpp
index 2e117a7..95fde6c 100644
--- a/src/imports/winextras/qquickwindwmfeatures.cpp
+++ b/src/imports/winextras/qquickwindwmfeatures.cpp
@@ -78,28 +78,28 @@ QQuickWinDwmFeatures::~QQuickWinDwmFeatures()
 
 void QQuickWinDwmFeatures::setCompositionEnabled(bool enabled)
 {
-    QWinExtras::setCompositionEnabled(enabled);
+    QtWinExtras::setCompositionEnabled(enabled);
 }
 
 bool QQuickWinDwmFeatures::isCompositionEnabled() const
 {
-    return QWinExtras::isCompositionEnabled();
+    return QtWinExtras::isCompositionEnabled();
 }
 
 QColor QQuickWinDwmFeatures::colorizationColor() const
 {
-    return QWinExtras::colorizationColor();
+    return QtWinExtras::colorizationColor();
 }
 
 QColor QQuickWinDwmFeatures::realColorizationColor() const
 {
-    return QWinExtras::realColorizationColor();
+    return QtWinExtras::realColorizationColor();
 }
 
 bool QQuickWinDwmFeatures::colorizationOpaqueBlend() const
 {
     bool opaque;
-    QWinExtras::colorizationColor(&opaque);
+    QtWinExtras::colorizationColor(&opaque);
     return opaque;
 }
 
@@ -185,7 +185,7 @@ bool QQuickWinDwmFeatures::excludedFromPeek() const
 {
     Q_D(const QQuickWinDwmFeatures);
     if (window())
-        return QWinExtras::isWindowExcludedFromPeek(window());
+        return QtWinExtras::isWindowExcludedFromPeek(window());
     else
         return d->peekExcluded;
 }
@@ -206,7 +206,7 @@ bool QQuickWinDwmFeatures::peekDisallowed() const
 {
     Q_D(const QQuickWinDwmFeatures);
     if (window())
-        return QWinExtras::isWindowPeekDisallowed(window());
+        return QtWinExtras::isWindowPeekDisallowed(window());
     else
         return d->peekDisallowed;
 }
@@ -232,7 +232,7 @@ QQuickWinDwmFeatures::Flip3DPolicy QQuickWinDwmFeatures::flip3DPolicy() const
 {
     Q_D(const QQuickWinDwmFeatures);
     if (window())
-        return static_cast<Flip3DPolicy>(QWinExtras::windowFlip3DPolicy(window()));
+        return static_cast<Flip3DPolicy>(QtWinExtras::windowFlip3DPolicy(window()));
     else
         return static_cast<Flip3DPolicy>(d->flipPolicy);
 }
@@ -306,13 +306,13 @@ void QQuickWinDwmFeaturesPrivate::update()
             q->window()->setColor(Qt::transparent);
         }
         if (peekExcluded)
-            QWinExtras::setWindowExcludedFromPeek(w, peekExcluded);
+            QtWinExtras::setWindowExcludedFromPeek(w, peekExcluded);
         if (peekDisallowed)
-            QWinExtras::setWindowDisallowPeek(w, peekDisallowed);
+            QtWinExtras::setWindowDisallowPeek(w, peekDisallowed);
         if (flipPolicy != QQuickWinDwmFeatures::FlipDefault)
-            QWinExtras::setWindowFlip3DPolicy(w, static_cast<QWinExtras::WindowFlip3DPolicy>(flipPolicy));
+            QtWinExtras::setWindowFlip3DPolicy(w, static_cast<QtWinExtras::WindowFlip3DPolicy>(flipPolicy));
         if (topMargin || rightMargin || bottomMargin || leftMargin)
-            QWinExtras::extendFrameIntoClientArea(w, leftMargin, topMargin, rightMargin, bottomMargin);
+            QtWinExtras::extendFrameIntoClientArea(w, leftMargin, topMargin, rightMargin, bottomMargin);
     }
 }
 
diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp
index 1f019be..a2b9308 100644
--- a/src/winextras/qwineventfilter.cpp
+++ b/src/winextras/qwineventfilter.cpp
@@ -77,7 +77,7 @@ bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long
         event = new QWinColorizationChangeEvent(msg->wParam, msg->lParam);
         break;
     case WM_DWMCOMPOSITIONCHANGED :
-        event = new QWinCompositionChangeEvent(QWinExtras::isCompositionEnabled());
+        event = new QWinCompositionChangeEvent(QtWinExtras::isCompositionEnabled());
         break;
     case WM_THEMECHANGED :
         event = new QWinEvent(QWinEvent::ThemeChange);
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
index dbdc6dc..a91fa93 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -67,9 +67,9 @@ Q_GUI_EXPORT QImage  qt_imageFromWinHBITMAP(HDC hdc, HBITMAP bitmap, int w, int
 Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon);
 
 /*!
-    \namespace QWinExtras
+    \namespace QtWinExtras
     \inmodule QtWinExtras
-    \brief The QWinExtras namespace contains miscellaneous Windows-specific functions.
+    \brief The QtWinExtras namespace contains miscellaneous Windows-specific functions.
     \inheaderfile QWinFunctions
 
  */
@@ -83,7 +83,7 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon);
 
     \sa toHBITMAP()
 */
-HBITMAP QWinExtras::createMask(const QBitmap &bitmap)
+HBITMAP QtWinExtras::createMask(const QBitmap &bitmap)
 {
     return qt_createIconMask(bitmap);
 }
@@ -99,7 +99,7 @@ HBITMAP QWinExtras::createMask(const QBitmap &bitmap)
 
     \sa fromHBITMAP()
 */
-HBITMAP QWinExtras::toHBITMAP(const QPixmap &p, QWinExtras::HBitmapFormat format)
+HBITMAP QtWinExtras::toHBITMAP(const QPixmap &p, QtWinExtras::HBitmapFormat format)
 {
     return qt_pixmapToWinHBITMAP(p, format);
 }
@@ -112,7 +112,7 @@ HBITMAP QWinExtras::toHBITMAP(const QPixmap &p, QWinExtras::HBitmapFormat format
 
     \sa toHBITMAP()
 */
-QPixmap QWinExtras::fromHBITMAP(HBITMAP bitmap, QWinExtras::HBitmapFormat format)
+QPixmap QtWinExtras::fromHBITMAP(HBITMAP bitmap, QtWinExtras::HBitmapFormat format)
 {
     return qt_pixmapFromWinHBITMAP(bitmap, format);
 }
@@ -127,7 +127,7 @@ QPixmap QWinExtras::fromHBITMAP(HBITMAP bitmap, QWinExtras::HBitmapFormat format
 
     \sa fromHICON()
 */
-HICON QWinExtras::toHICON(const QPixmap &p)
+HICON QtWinExtras::toHICON(const QPixmap &p)
 {
     return qt_pixmapToWinHICON(p);
 }
@@ -141,7 +141,7 @@ HICON QWinExtras::toHICON(const QPixmap &p)
 
     \sa toHBITMAP()
 */
-QImage QWinExtras::imageFromHBITMAP(HDC hdc, HBITMAP bitmap, int width, int height)
+QImage QtWinExtras::imageFromHBITMAP(HDC hdc, HBITMAP bitmap, int width, int height)
 {
     return qt_imageFromWinHBITMAP(hdc, bitmap, width, height);
 }
@@ -153,7 +153,7 @@ QImage QWinExtras::imageFromHBITMAP(HDC hdc, HBITMAP bitmap, int width, int heig
 
     \sa toHICON()
 */
-QPixmap QWinExtras::fromHICON(HICON icon)
+QPixmap QtWinExtras::fromHICON(HICON icon)
 {
     return qt_pixmapFromWinHICON(icon);
 }
@@ -168,7 +168,7 @@ HRGN qt_RectToHRGN(const QRect &rc)
 
     Returns a HRGN that is equivalent to the given \a region.
  */
-HRGN QWinExtras::toHRGN(const QRegion &region)
+HRGN QtWinExtras::toHRGN(const QRegion &region)
 {
     if (region.isNull() || region.rectCount() == 0) {
         return 0;
@@ -192,7 +192,7 @@ HRGN QWinExtras::toHRGN(const QRegion &region)
 
     Returns a QRegion that is equivalent to the given \a hrgn.
  */
-QRegion QWinExtras::fromHRGN(HRGN hrgn)
+QRegion QtWinExtras::fromHRGN(HRGN hrgn)
 {
     DWORD regionDataSize = GetRegionData(hrgn, 0, NULL);
     if (regionDataSize == 0)
@@ -221,7 +221,7 @@ QRegion QWinExtras::fromHRGN(HRGN hrgn)
     Returns a message string that explains the \a hresult error id specified or
     an empty string if the explanation cannot be found.
  */
-QString QWinExtras::stringFromHresult(HRESULT hresult)
+QString QtWinExtras::stringFromHresult(HRESULT hresult)
 {
     _com_error error(hresult);
     QString errorMsg;
@@ -238,7 +238,7 @@ QString QWinExtras::stringFromHresult(HRESULT hresult)
     Returns the code name of the \a hresult error id specified (usually the name
     of the WinAPI macro) or an empty string if the message is unknown.
  */
-QString QWinExtras::errorStringFromHresult(HRESULT hresult)
+QString QtWinExtras::errorStringFromHresult(HRESULT hresult)
 {
     switch (hresult) {
     case 0x8000FFFF : return QStringLiteral("E_UNEXPECTED");
@@ -1430,7 +1430,7 @@ QString QWinExtras::errorStringFromHresult(HRESULT hresult)
     \a opaqueBlend will contain true if the color is an opaque blend and false
     otherwise.
  */
-QColor QWinExtras::colorizationColor(bool *opaqueBlend)
+QColor QtWinExtras::colorizationColor(bool *opaqueBlend)
 {
     QWinEventFilter::setup();
 
@@ -1450,9 +1450,9 @@ QColor QWinExtras::colorizationColor(bool *opaqueBlend)
     alpha-blended color which often turns out a semitransparent gray rather
     than something similar to what is chosen by the user.
 
-    \sa QWinExtras::colorizationColor()
+    \sa QtWinExtras::colorizationColor()
  */
-QColor QWinExtras::realColorizationColor()
+QColor QtWinExtras::realColorizationColor()
 {
     QWinEventFilter::setup();
 
@@ -1466,9 +1466,9 @@ QColor QWinExtras::realColorizationColor()
 }
 
 /*!
-    \fn QWinExtras::setWindowExcludedFromPeek(QWidget *window, bool exclude)
+    \fn QtWinExtras::setWindowExcludedFromPeek(QWidget *window, bool exclude)
     \since 5.2
-    \overload QWinExtras::setWindowExcludedFromPeek()
+    \overload QtWinExtras::setWindowExcludedFromPeek()
 */
 
 /*!
@@ -1476,7 +1476,7 @@ QColor QWinExtras::realColorizationColor()
 
     Excludes the specified \a window from Aero Peek if \a exclude is true.
  */
-void QWinExtras::setWindowExcludedFromPeek(QWindow *window, bool exclude)
+void QtWinExtras::setWindowExcludedFromPeek(QWindow *window, bool exclude)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
     BOOL value = exclude;
@@ -1484,9 +1484,9 @@ void QWinExtras::setWindowExcludedFromPeek(QWindow *window, bool exclude)
 }
 
 /*!
-    \fn bool QWinExtras::isWindowExcludedFromPeek(QWidget *window)
+    \fn bool QtWinExtras::isWindowExcludedFromPeek(QWidget *window)
     \since 5.2
-    \overload QWinExtras::isWindowExcludedFromPeek()
+    \overload QtWinExtras::isWindowExcludedFromPeek()
 */
 
 /*!
@@ -1494,7 +1494,7 @@ void QWinExtras::setWindowExcludedFromPeek(QWindow *window, bool exclude)
 
     Returns true if the specified \a window is excluded from Aero Peek.
  */
-bool QWinExtras::isWindowExcludedFromPeek(QWindow *window)
+bool QtWinExtras::isWindowExcludedFromPeek(QWindow *window)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
     BOOL value;
@@ -1503,9 +1503,9 @@ bool QWinExtras::isWindowExcludedFromPeek(QWindow *window)
 }
 
 /*!
-    \fn void QWinExtras::setWindowDisallowPeek(QWidget *window, bool disallow)
+    \fn void QtWinExtras::setWindowDisallowPeek(QWidget *window, bool disallow)
     \since 5.2
-    \overload QWinExtras::setWindowDisallowPeek()
+    \overload QtWinExtras::setWindowDisallowPeek()
 */
 
 /*!
@@ -1517,7 +1517,7 @@ bool QWinExtras::isWindowExcludedFromPeek(QWindow *window)
 
     The default is false.
  */
-void QWinExtras::setWindowDisallowPeek(QWindow *window, bool disallow)
+void QtWinExtras::setWindowDisallowPeek(QWindow *window, bool disallow)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
     BOOL value = disallow;
@@ -1525,9 +1525,9 @@ void QWinExtras::setWindowDisallowPeek(QWindow *window, bool disallow)
 }
 
 /*!
-    \fn bool QWinExtras::isWindowPeekDisallowed(QWidget *window)
+    \fn bool QtWinExtras::isWindowPeekDisallowed(QWidget *window)
     \since 5.2
-    \overload QWinExtras::isWindowPeekDisallowed()
+    \overload QtWinExtras::isWindowPeekDisallowed()
 */
 
 /*!
@@ -1536,7 +1536,7 @@ void QWinExtras::setWindowDisallowPeek(QWindow *window, bool disallow)
     Returns true if Aero Peek is disallowed on the thumbnail of the specified
     \a window.
  */
-bool QWinExtras::isWindowPeekDisallowed(QWindow *window)
+bool QtWinExtras::isWindowPeekDisallowed(QWindow *window)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
     BOOL value;
@@ -1545,9 +1545,9 @@ bool QWinExtras::isWindowPeekDisallowed(QWindow *window)
 }
 
 /*!
-    \fn void QWinExtras::setWindowFlip3DPolicy(QWidget *window, QWinExtras::WindowFlip3DPolicy policy)
+    \fn void QtWinExtras::setWindowFlip3DPolicy(QWidget *window, QtWinExtras::WindowFlip3DPolicy policy)
     \since 5.2
-    \overload QWinExtras::setWindowFlip3DPolicy()
+    \overload QtWinExtras::setWindowFlip3DPolicy()
 */
 
 /*!
@@ -1555,7 +1555,7 @@ bool QWinExtras::isWindowPeekDisallowed(QWindow *window)
 
     Sets the Flip3D policy \a policy for the specified \a window.
  */
-void QWinExtras::setWindowFlip3DPolicy(QWindow *window, QWinExtras::WindowFlip3DPolicy policy)
+void QtWinExtras::setWindowFlip3DPolicy(QWindow *window, QtWinExtras::WindowFlip3DPolicy policy)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
 
@@ -1583,9 +1583,9 @@ void QWinExtras::setWindowFlip3DPolicy(QWindow *window, QWinExtras::WindowFlip3D
 }
 
 /*!
-    \fn QWinExtras::WindowFlip3DPolicy QWinExtras::windowFlip3DPolicy(QWidget *window)
+    \fn QtWinExtras::WindowFlip3DPolicy QtWinExtras::windowFlip3DPolicy(QWidget *window)
     \since 5.2
-    \overload QWinExtras::windowFlip3DPolicy()
+    \overload QtWinExtras::windowFlip3DPolicy()
  */
 
 /*!
@@ -1593,22 +1593,22 @@ void QWinExtras::setWindowFlip3DPolicy(QWindow *window, QWinExtras::WindowFlip3D
 
     Returns the current Flip3D policy for the specified \a window.
  */
-QWinExtras::WindowFlip3DPolicy QWinExtras::windowFlip3DPolicy(QWindow *window)
+QtWinExtras::WindowFlip3DPolicy QtWinExtras::windowFlip3DPolicy(QWindow *window)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
 
     DWORD value;
-    QWinExtras::WindowFlip3DPolicy policy;
+    QtWinExtras::WindowFlip3DPolicy policy;
     qt_DwmGetWindowAttribute(reinterpret_cast<HWND>(window->winId()), qt_DWMWA_FLIP3D_POLICY, &value, sizeof(value));
     switch (value) {
     case qt_DWMFLIP3D_EXCLUDEABOVE :
-        policy = QWinExtras::FlipExcludeAbove;
+        policy = QtWinExtras::FlipExcludeAbove;
         break;
     case qt_DWMFLIP3D_EXCLUDEBELOW :
-        policy = QWinExtras::FlipExcludeBelow;
+        policy = QtWinExtras::FlipExcludeBelow;
         break;
     default :
-        policy = QWinExtras::FlipDefault;
+        policy = QtWinExtras::FlipDefault;
         break;
     }
     return policy;
@@ -1622,9 +1622,9 @@ void qt_ExtendFrameIntoClientArea(QWindow *window, int left, int top, int right,
     qt_DwmExtendFrameIntoClientArea(reinterpret_cast<HWND>(window->winId()), &margins);
 }
 
-/*! \fn void QWinExtras::extendFrameIntoClientArea(QWidget *window, int left, int top, int right, int bottom)
+/*! \fn void QtWinExtras::extendFrameIntoClientArea(QWidget *window, int left, int top, int right, int bottom)
     \since 5.2
-    \overload QWinExtras::extendFrameIntoClientArea()
+    \overload QtWinExtras::extendFrameIntoClientArea()
  */
 
 /*!
@@ -1642,17 +1642,17 @@ void qt_ExtendFrameIntoClientArea(QWindow *window, int left, int top, int right,
     \note If \a window is a QWidget handle, set the
     Qt::WA_NoSystemBackground attribute for your widget.
 
-    \sa QWinExtras::resetExtendedFrame()
+    \sa QtWinExtras::resetExtendedFrame()
  */
-void QWinExtras::extendFrameIntoClientArea(QWindow *window, int left, int top, int right, int bottom)
+void QtWinExtras::extendFrameIntoClientArea(QWindow *window, int left, int top, int right, int bottom)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
     qt_ExtendFrameIntoClientArea(window, left, top, right, bottom);
 }
 
-/*! \fn void QWinExtras::extendFrameIntoClientArea(QWidget *window, const QMargins &margins)
+/*! \fn void QtWinExtras::extendFrameIntoClientArea(QWidget *window, const QMargins &margins)
     \since 5.2
-    \overload QWinExtras::extendFrameIntoClientArea()
+    \overload QtWinExtras::extendFrameIntoClientArea()
 
     Convenience overload that allows passing frame sizes in a \a margins
     structure.
@@ -1660,20 +1660,20 @@ void QWinExtras::extendFrameIntoClientArea(QWindow *window, int left, int top, i
 
 /*!
     \since 5.2
-    \overload QWinExtras::extendFrameIntoClientArea()
+    \overload QtWinExtras::extendFrameIntoClientArea()
 
     Extends the glass frame into the client area of the specified \a window
     using the specified \a margins.
  */
-void QWinExtras::extendFrameIntoClientArea(QWindow *window, const QMargins &margins)
+void QtWinExtras::extendFrameIntoClientArea(QWindow *window, const QMargins &margins)
 {
-    QWinExtras::extendFrameIntoClientArea(window, margins.left(), margins.top(), margins.right(), margins.bottom());
+    QtWinExtras::extendFrameIntoClientArea(window, margins.left(), margins.top(), margins.right(), margins.bottom());
 }
 
 /*!
-    \fn void QWinExtras::resetExtendedFrame(QWidget *window)
+    \fn void QtWinExtras::resetExtendedFrame(QWidget *window)
     \since 5.2
-    \overload QWinExtras::resetExtendedFrame()
+    \overload QtWinExtras::resetExtendedFrame()
  */
 
 /*!
@@ -1687,18 +1687,18 @@ void QWinExtras::extendFrameIntoClientArea(QWindow *window, const QMargins &marg
     \note You must unset the Qt::WA_NoSystemBackground attribute for
     extendFrameIntoClientArea() to work.
 
-    \sa QWinExtras::extendFrameIntoClientArea()
+    \sa QtWinExtras::extendFrameIntoClientArea()
  */
-void QWinExtras::resetExtendedFrame(QWindow *window)
+void QtWinExtras::resetExtendedFrame(QWindow *window)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
     qt_ExtendFrameIntoClientArea(window, 0, 0, 0, 0);
 }
 
 /*!
-    \fn void QWinExtras::enableBlurBehindWindow(QWidget *window, const QRegion &region)
+    \fn void QtWinExtras::enableBlurBehindWindow(QWidget *window, const QRegion &region)
     \since 5.2
-    \overload QWinExtras::enableBlurBehindWindow()
+    \overload QtWinExtras::enableBlurBehindWindow()
  */
 
 /*!
@@ -1709,7 +1709,7 @@ void QWinExtras::resetExtendedFrame(QWindow *window)
 
     \sa disableBlurBehindWindow()
  */
-void QWinExtras::enableBlurBehindWindow(QWindow *window, const QRegion &region)
+void QtWinExtras::enableBlurBehindWindow(QWindow *window, const QRegion &region)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
 
@@ -1730,9 +1730,9 @@ void QWinExtras::enableBlurBehindWindow(QWindow *window, const QRegion &region)
 }
 
 /*!
-    \fn void QWinExtras::enableBlurBehindWindow(QWidget *window)
+    \fn void QtWinExtras::enableBlurBehindWindow(QWidget *window)
     \since 5.2
-    \overload QWinExtras::enableBlurBehindWindow()
+    \overload QtWinExtras::enableBlurBehindWindow()
  */
 
 /*!
@@ -1742,15 +1742,15 @@ void QWinExtras::enableBlurBehindWindow(QWindow *window, const QRegion &region)
 
     \sa disableBlurBehindWindow()
  */
-void QWinExtras::enableBlurBehindWindow(QWindow *window)
+void QtWinExtras::enableBlurBehindWindow(QWindow *window)
 {
-    QWinExtras::enableBlurBehindWindow(window, QRegion());
+    QtWinExtras::enableBlurBehindWindow(window, QRegion());
 }
 
 /*!
-    \fn void QWinExtras::disableBlurBehindWindow(QWidget *window)
+    \fn void QtWinExtras::disableBlurBehindWindow(QWidget *window)
     \since 5.2
-    \overload QWinExtras::disableBlurBehindWindow()
+    \overload QtWinExtras::disableBlurBehindWindow()
  */
 
 /*!
@@ -1760,7 +1760,7 @@ void QWinExtras::enableBlurBehindWindow(QWindow *window)
 
     \sa enableBlurBehindWindow()
  */
-void QWinExtras::disableBlurBehindWindow(QWindow *window)
+void QtWinExtras::disableBlurBehindWindow(QWindow *window)
 {
     Q_ASSERT_X(window, Q_FUNC_INFO, "window is null");
     qt_DWM_BLURBEHIND dwmbb = {0, 0, 0, 0};
@@ -1774,7 +1774,7 @@ void QWinExtras::disableBlurBehindWindow(QWindow *window)
 
     Returns the DWM composition state.
  */
-bool QWinExtras::isCompositionEnabled()
+bool QtWinExtras::isCompositionEnabled()
 {
     QWinEventFilter::setup();
 
@@ -1791,7 +1791,7 @@ bool QWinExtras::isCompositionEnabled()
     \note The underlying function was declared deprecated as of Windows 8 and
     takes no effect.
  */
-void QWinExtras::setCompositionEnabled(bool enabled)
+void QtWinExtras::setCompositionEnabled(bool enabled)
 {
     QWinEventFilter::setup();
 
@@ -1804,7 +1804,7 @@ void QWinExtras::setCompositionEnabled(bool enabled)
 
     Returns whether the colorization color is an opaque blend.
  */
-bool QWinExtras::isCompositionOpaque()
+bool QtWinExtras::isCompositionOpaque()
 {
     bool opaque;
     colorizationColor(&opaque);
@@ -1820,7 +1820,7 @@ bool QWinExtras::isCompositionOpaque()
     \l{http://msdn.microsoft.com/en-us/library/windows/desktop/dd378459.aspx}
     {Application User Model IDs}.
  */
-void QWinExtras::setCurrentProcessExplicitAppUserModelID(const QString &id)
+void QtWinExtras::setCurrentProcessExplicitAppUserModelID(const QString &id)
 {
     wchar_t *wid = qt_qstringToNullTerminated(id);
     qt_SetCurrentProcessExplicitAppUserModelID(wid);
@@ -1860,9 +1860,9 @@ ITaskbarList2 *qt_createITaskbarList2()
 }
 
 /*!
-    \fn void QWinExtras::markFullscreenWindow(QWidget *window, bool fullscreen)
+    \fn void QtWinExtras::markFullscreenWindow(QWidget *window, bool fullscreen)
     \since 5.2
-    \overload QWinExtras::markFullscreenWindow()
+    \overload QtWinExtras::markFullscreenWindow()
  */
 
 /*!
@@ -1876,7 +1876,7 @@ ITaskbarList2 *qt_createITaskbarList2()
     taskbar always tries to determine whether a window is running in the
     full-screen mode.
  */
-void QWinExtras::markFullscreenWindow(QWindow *window, bool fullscreen)
+void QtWinExtras::markFullscreenWindow(QWindow *window, bool fullscreen)
 {
     ITaskbarList2 *pTbList = qt_createITaskbarList2();
     if (pTbList) {
@@ -1886,9 +1886,9 @@ void QWinExtras::markFullscreenWindow(QWindow *window, bool fullscreen)
 }
 
 /*!
-    \fn void QWinExtras::taskbarActivateTab(QWidget *window)
+    \fn void QtWinExtras::taskbarActivateTab(QWidget *window)
     \since 5.2
-    \overload QWinExtras::taskbarActivateTab()
+    \overload QtWinExtras::taskbarActivateTab()
  */
 
 /*!
@@ -1896,7 +1896,7 @@ void QWinExtras::markFullscreenWindow(QWindow *window, bool fullscreen)
 
     Activates an item on the taskbar without activating the \a window itself.
  */
-void QWinExtras::taskbarActivateTab(QWindow *window)
+void QtWinExtras::taskbarActivateTab(QWindow *window)
 {
     ITaskbarList *pTbList = qt_createITaskbarList2();
     if (pTbList) {
@@ -1906,9 +1906,9 @@ void QWinExtras::taskbarActivateTab(QWindow *window)
 }
 
 /*!
-    \fn void QWinExtras::taskbarActivateTabAlt(QWidget *window)
+    \fn void QtWinExtras::taskbarActivateTabAlt(QWidget *window)
     \since 5.2
-    \overload QWinExtras::taskbarActivateTabAlt()
+    \overload QtWinExtras::taskbarActivateTabAlt()
  */
 
 /*!
@@ -1917,7 +1917,7 @@ void QWinExtras::taskbarActivateTab(QWindow *window)
     Marks the item that represents the specified \a window on the taskbar
     as active, but does not activate it visually.
  */
-void QWinExtras::taskbarActivateTabAlt(QWindow *window)
+void QtWinExtras::taskbarActivateTabAlt(QWindow *window)
 {
     ITaskbarList *pTbList = qt_createITaskbarList2();
     if (pTbList) {
@@ -1927,9 +1927,9 @@ void QWinExtras::taskbarActivateTabAlt(QWindow *window)
 }
 
 /*!
-    \fn void QWinExtras::taskbarAddTab(QWidget *window)
+    \fn void QtWinExtras::taskbarAddTab(QWidget *window)
     \since 5.2
-    \overload QWinExtras::taskbarAddTab()
+    \overload QtWinExtras::taskbarAddTab()
  */
 
 /*!
@@ -1937,7 +1937,7 @@ void QWinExtras::taskbarActivateTabAlt(QWindow *window)
 
     Adds an item for the specified \a window to the taskbar.
  */
-void QWinExtras::taskbarAddTab(QWindow *window)
+void QtWinExtras::taskbarAddTab(QWindow *window)
 {
     ITaskbarList *pTbList = qt_createITaskbarList2();
     if (pTbList) {
@@ -1947,9 +1947,9 @@ void QWinExtras::taskbarAddTab(QWindow *window)
 }
 
 /*!
-    \fn void QWinExtras::taskbarDeleteTab(QWidget *window)
+    \fn void QtWinExtras::taskbarDeleteTab(QWidget *window)
     \since 5.2
-    \overload QWinExtras::taskbarDeleteTab()
+    \overload QtWinExtras::taskbarDeleteTab()
  */
 
 /*!
@@ -1957,7 +1957,7 @@ void QWinExtras::taskbarAddTab(QWindow *window)
 
     Removes the specified \a window from the taskbar.
  */
-void QWinExtras::taskbarDeleteTab(QWindow *window)
+void QtWinExtras::taskbarDeleteTab(QWindow *window)
 {
     ITaskbarList *pTbList = qt_createITaskbarList3();
     if (pTbList) {
@@ -1967,7 +1967,7 @@ void QWinExtras::taskbarDeleteTab(QWindow *window)
 }
 
 /*!
-    \enum QWinExtras::HBitmapFormat
+    \enum QtWinExtras::HBitmapFormat
 
     \since 5.2
 
@@ -1993,7 +1993,7 @@ void QWinExtras::taskbarDeleteTab(QWindow *window)
 */
 
 /*!
-    \enum QWinExtras::WindowFlip3DPolicy
+    \enum QtWinExtras::WindowFlip3DPolicy
 
     \since 5.2
 
diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h
index 81bd71b..c3a352d 100644
--- a/src/winextras/qwinfunctions.h
+++ b/src/winextras/qwinfunctions.h
@@ -60,7 +60,7 @@ class QWindow;
 class QString;
 class QMargins;
 
-namespace QWinExtras
+namespace QtWinExtras
 {
 
 enum HBitmapFormat
@@ -126,7 +126,7 @@ void Q_WINEXTRAS_EXPORT taskbarDeleteTab(QWindow *);
 
 #include <QtWidgets/qwidget.h>
 
-namespace QWinExtras
+namespace QtWinExtras
 {
 
 inline void setWindowExcludedFromPeek(QWidget *window, bool exclude)
@@ -243,7 +243,7 @@ inline void taskbarDeleteTab(QWidget *window)
 
 #ifdef Q_QDOC
 
-namespace QWinExtras
+namespace QtWinExtras
 {
 
 HBITMAP createMask(const QBitmap &bitmap);
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index b0374a6..14e41c9 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -92,7 +92,7 @@ public:
 
     static void warning(const char *function, HRESULT hresult)
     {
-        const QString err = QWinExtras::errorStringFromHresult(hresult);
+        const QString err = QtWinExtras::errorStringFromHresult(hresult);
         qWarning("QWinJumpList: %s() failed: %#010x, %s.", function, (unsigned)hresult, qPrintable(err));
     }
 
@@ -178,7 +178,7 @@ public:
         IObjectCollection *collection = 0;
         HRESULT hresult = CoCreateInstance(CLSID_EnumerableObjectCollection, 0, CLSCTX_INPROC_SERVER, IID_IObjectCollection, reinterpret_cast<void **>(&collection));
         if (FAILED(hresult)) {
-            const QString err = QWinExtras::errorStringFromHresult(hresult);
+            const QString err = QtWinExtras::errorStringFromHresult(hresult);
             qWarning("QWinJumpList: failed to instantiate IObjectCollection: %#010x, %s.", (unsigned)hresult, qPrintable(err));
             return 0;
         }
@@ -274,7 +274,7 @@ public:
         IShellLinkW *link = 0;
         HRESULT hresult = CoCreateInstance(CLSID_ShellLink, 0, CLSCTX_INPROC_SERVER, IID_IShellLinkW, reinterpret_cast<void **>(&link));
         if (FAILED(hresult)) {
-            const QString err = QWinExtras::errorStringFromHresult(hresult);
+            const QString err = QtWinExtras::errorStringFromHresult(hresult);
             qWarning("QWinJumpList: failed to instantiate IShellLinkW: %#010x, %s.", (unsigned)hresult, qPrintable(err));
             return 0;
         }
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp
index 9d2a46e..2fe34e0 100644
--- a/src/winextras/qwintaskbarbutton.cpp
+++ b/src/winextras/qwintaskbarbutton.cpp
@@ -87,12 +87,12 @@ QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate() : progressBar(0), pTbList(0
     HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, IID_ITaskbarList4, reinterpret_cast<void **>(&pTbList));
     if (FAILED(hresult)) {
         pTbList = 0;
-        const QString err = QWinExtras::errorStringFromHresult(hresult);
+        const QString err = QtWinExtras::errorStringFromHresult(hresult);
         qWarning("QWinTaskbarButton: IID_ITaskbarList4 was not created: %#010x, %s.", (unsigned)hresult, qPrintable(err));
     } else if (FAILED(pTbList->HrInit())) {
         pTbList->Release();
         pTbList = 0;
-        const QString err = QWinExtras::errorStringFromHresult(hresult);
+        const QString err = QtWinExtras::errorStringFromHresult(hresult);
         qWarning("QWinTaskbarButton: IID_ITaskbarList4 was not initialized: %#010x, %s.", (unsigned)hresult, qPrintable(err));
     }
 }
@@ -124,7 +124,7 @@ void QWinTaskbarButtonPrivate::updateOverlayIcon()
         descrPtr[overlayIconDescription.toWCharArray(descrPtr)] = 0;
     }
     if (!overlayIcon.isNull())
-        hicon = QWinExtras::toHICON(overlayIcon.pixmap(iconSize()));
+        hicon = QtWinExtras::toHICON(overlayIcon.pixmap(iconSize()));
 
     if (hicon)
         pTbList->SetOverlayIcon(handle(), hicon, descrPtr);
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp
index 75cf8c3..ebb1ed8 100644
--- a/src/winextras/qwinthumbnailtoolbar.cpp
+++ b/src/winextras/qwinthumbnailtoolbar.cpp
@@ -195,7 +195,7 @@ static inline ITaskbarList4 *createTaskbarList()
     ITaskbarList4 *result = 0;
     HRESULT hresult = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, IID_ITaskbarList4, reinterpret_cast<void **>(&result));
     if (FAILED(hresult)) {
-        const QString err = QWinExtras::errorStringFromHresult(hresult);
+        const QString err = QtWinExtras::errorStringFromHresult(hresult);
         qWarning("QWinThumbnailToolBar: IID_ITaskbarList4 was not created: %#010x, %s.",
                  (unsigned)hresult, qPrintable(err));
         return 0;
@@ -203,7 +203,7 @@ static inline ITaskbarList4 *createTaskbarList()
     hresult = result->HrInit();
     if (FAILED(hresult)) {
         result->Release();
-        const QString err = QWinExtras::errorStringFromHresult(hresult);
+        const QString err = QtWinExtras::errorStringFromHresult(hresult);
         qWarning("QWinThumbnailToolBar: IID_ITaskbarList4 was not initialized: %#010x, %s.",
                  (unsigned)hresult, qPrintable(err));
         return 0;
@@ -261,7 +261,7 @@ void QWinThumbnailToolBarPrivate::_q_updateToolbar()
         buttons[i].dwFlags = makeNativeButtonFlags(button);
         buttons[i].dwMask  = makeButtonMask(button);
         if (!button->icon().isNull()) {;
-            buttons[i].hIcon = QWinExtras::toHICON(button->icon().pixmap(GetSystemMetrics(SM_CXSMICON)));
+            buttons[i].hIcon = QtWinExtras::toHICON(button->icon().pixmap(GetSystemMetrics(SM_CXSMICON)));
             if (!buttons[i].hIcon)
                 buttons[i].hIcon = (HICON)LoadImage(0, IDI_APPLICATION, IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED);
         }
@@ -359,7 +359,7 @@ QString QWinThumbnailToolBarPrivate::msgComFailed(const char *function, HRESULT
     return QString::fromLatin1("QWinThumbnailToolBar: %1() failed: #%2: %3")
             .arg(QLatin1String(function))
             .arg((unsigned)hresult, 10, 16, QLatin1Char('0'))
-            .arg(QWinExtras::errorStringFromHresult(hresult));
+            .arg(QtWinExtras::errorStringFromHresult(hresult));
 }
 
 QT_END_NAMESPACE
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 2cc1da0..72c129f 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -95,7 +95,7 @@ void tst_QPixmap::toHBITMAP()
     QPixmap pm(100, 100);
     pm.fill(QColor(red, green, blue));
 
-    const HBITMAP bitmap = QWinExtras::toHBITMAP(pm);
+    const HBITMAP bitmap = QtWinExtras::toHBITMAP(pm);
 
     QVERIFY(bitmap != 0);
 
@@ -145,7 +145,7 @@ void tst_QPixmap::fromHBITMAP()
     const HGDIOBJ oldBrush = SelectObject(bitmapDc, CreateSolidBrush(RGB(red, green, blue)));
     Rectangle(bitmapDc, 0, 0, 100, 100);
 
-    const QPixmap pixmap = QWinExtras::fromHBITMAP(bitmap);
+    const QPixmap pixmap = QtWinExtras::fromHBITMAP(bitmap);
     QCOMPARE(pixmap.width(), 100);
     QCOMPARE(pixmap.height(), 100);
 
@@ -233,7 +233,7 @@ void tst_QPixmap::toHICON()
 
     const HDC displayDc = GetDC(0);
     const HDC bitmapDc = CreateCompatibleDC(displayDc);
-    const HBITMAP bitmap = QWinExtras::toHBITMAP(empty, QWinExtras::HBitmapAlpha);
+    const HBITMAP bitmap = QtWinExtras::toHBITMAP(empty, QtWinExtras::HBitmapAlpha);
     SelectObject(bitmapDc, bitmap);
 
     const QString imageFileName = pngFileName(image, width, height);
@@ -242,14 +242,14 @@ void tst_QPixmap::toHICON()
     const QImage imageFromFile = QImage(imageFileName).convertToFormat(QImage::Format_ARGB32_Premultiplied);
     QVERIFY(!imageFromFile.isNull());
 
-    const HICON icon = QWinExtras::toHICON(QPixmap::fromImage(imageFromFile));
+    const HICON icon = QtWinExtras::toHICON(QPixmap::fromImage(imageFromFile));
 
     DrawIconEx(bitmapDc, 0, 0, icon, width, height, 0, 0, DI_NORMAL);
 
     DestroyIcon(icon);
     DeleteDC(bitmapDc);
 
-    const QImage imageFromHICON = QWinExtras::fromHBITMAP(bitmap, QWinExtras::HBitmapAlpha).toImage();
+    const QImage imageFromHICON = QtWinExtras::fromHBITMAP(bitmap, QtWinExtras::HBitmapAlpha).toImage();
     QVERIFY(!imageFromHICON.isNull());
 
     ReleaseDC(0, displayDc);
@@ -275,7 +275,7 @@ void tst_QPixmap::fromHICON()
     QVERIFY2(QFileInfo(iconFileName).exists(), qPrintable(iconFileName));
 
     const HICON icon = (HICON)LoadImage(0, (wchar_t*)(iconFileName).utf16(), IMAGE_ICON, width, height, LR_LOADFROMFILE);
-    const QImage imageFromHICON = QWinExtras::fromHICON(icon).toImage();
+    const QImage imageFromHICON = QtWinExtras::fromHICON(icon).toImage();
     DestroyIcon(icon);
 
     const QString imageFileName = pngFileName(image, width, height);