diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-13 19:41:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-13 19:41:19 +0200 |
| commit | 0a47045c23bdbda1516a39ea83ab915a7271418f (patch) | |
| tree | c2abc0c117494aa24627b994927b0fcd67393623 | |
| parent | b4331a129d2e54b008ad6c471b455ede3c774280 (diff) | |
| parent | d9a0197149916273baa498508f10a26891444d21 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I7d95538987dd2766565cfdfa9075263225d1b143
| -rw-r--r-- | src/imports/winextras/qquickwin_p.h | 3 | ||||
| -rw-r--r-- | src/winextras/qwintaskbarbutton.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 1 | ||||
| -rw-r--r-- | tests/auto/headersclean/headersclean.pro | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/imports/winextras/qquickwin_p.h b/src/imports/winextras/qquickwin_p.h index 8b6052e..5c8d5d1 100644 --- a/src/imports/winextras/qquickwin_p.h +++ b/src/imports/winextras/qquickwin_p.h @@ -43,7 +43,6 @@ QT_BEGIN_NAMESPACE class QQuickWin : public QObject { Q_OBJECT - Q_ENUMS(HBitmapFormat WindowFlip3DPolicy) public: enum HBitmapFormat @@ -52,6 +51,7 @@ public: HBitmapPremultipliedAlpha = QtWin::HBitmapPremultipliedAlpha, HBitmapAlpha = QtWin::HBitmapAlpha }; + Q_ENUM(HBitmapFormat) enum WindowFlip3DPolicy { @@ -59,6 +59,7 @@ public: FlipExcludeBelow = QtWin::FlipExcludeBelow, FlipExcludeAbove = QtWin::FlipExcludeAbove }; + Q_ENUM(WindowFlip3DPolicy) }; QT_END_NAMESPACE diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index f0be30a..7150e1b 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \class QWinTaskbarButton \inmodule QtWinExtras \brief The QWinTaskbarButton class represents the Windows taskbar button for - a window. + a top-level window (Windows 7 and newer). \since 5.2 @@ -71,6 +71,9 @@ QT_BEGIN_NAMESPACE \snippet code/taskbar.cpp taskbar_cpp + \note The class wraps API only available since Windows 7. Instantiating it + on Windows XP or Windows Vista causes a runtime warning. + \sa QWinTaskbarProgress */ @@ -104,7 +107,8 @@ QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate() : progressBar(0), pTbList(0 QWinTaskbarButtonPrivate::~QWinTaskbarButtonPrivate() { - pTbList->Release(); + if (pTbList) + pTbList->Release(); } HWND QWinTaskbarButtonPrivate::handle() diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 1e5d1ba..9d16ff3 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,6 +1,5 @@ TEMPLATE = subdirs SUBDIRS += \ - headersclean \ cmake \ qwinthumbnailtoolbar \ qpixmap \ diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro deleted file mode 100644 index a23e20d..0000000 --- a/tests/auto/headersclean/headersclean.pro +++ /dev/null @@ -1,2 +0,0 @@ -QT = winextras -load(qt_headersclean) |