feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove Qt version checks.

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2014-08-29 13:18:41 +02:00
parent 6f58e5b798
commit 847f10e9cc
63 changed files with 68 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/coreplugin/progressmanager/progressmanager_win.cpp
View File

@@ -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);
}