diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-29 13:18:41 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-09-08 10:33:25 +0200 |
| commit | 847f10e9ccc8c3541782a790e04c85c6b4c701da (patch) | |
| tree | e59ebac8dfb77c88d8e5540855836ca79a9a7a91 /src/plugins/coreplugin/progressmanager | |
| parent | 6f58e5b798e368e6254cc837e489bd8fd8f066e9 (diff) | |
| download | qt-creator-847f10e9ccc8c3541782a790e04c85c6b4c701da.tar.gz | |
Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.
Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/coreplugin/progressmanager')
| -rw-r--r-- | src/plugins/coreplugin/progressmanager/progressmanager_win.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp index b91b4542d1..d069e8345f 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager_win.cpp @@ -27,18 +27,16 @@ ** ****************************************************************************/ +#include <QGuiApplication> #include <QVariant> #include <QMainWindow> #include <QFont> #include <QFontMetrics> #include <QPixmap> #include <QPainter> -#if QT_VERSION >= 0x050000 -# include <QGuiApplication> -# include <QWindow> -# include <qpa/qplatformnativeinterface.h> -#endif +#include <QWindow> #include <QLabel> +#include <qpa/qplatformnativeinterface.h> #include <coreplugin/icore.h> #include <utils/stylehelper.h> @@ -58,8 +56,6 @@ namespace { ITaskbarList3* pITask = 0; } -#if QT_VERSION >= 0x050000 - QT_BEGIN_NAMESPACE Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &p); QT_END_NAMESPACE @@ -80,12 +76,6 @@ static inline HWND hwndOfWidget(const QWidget *w) result = QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", window); return static_cast<HWND>(result); } -#else -static inline HWND hwndOfWidget(const QWidget *w) -{ - return w->winId(); -} -#endif void Core::Internal::ProgressManagerPrivate::initInternal() { @@ -131,11 +121,7 @@ void Core::Internal::ProgressManagerPrivate::doSetApplicationLabel(const QString font.setPixelSize(pix.height() * 0.5); p.setFont(font); p.drawText(pix.rect(), Qt::AlignCenter, text); -#if QT_VERSION >= 0x050000 const HICON icon = qt_pixmapToWinHICON(pix); -#else - const HICON icon = pix.toWinHICON(); -#endif pITask->SetOverlayIcon(winId, icon, (wchar_t*)text.utf16()); DestroyIcon(icon); } |