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

Drop Qt5: AdvancedDockingSystem: Remove code below Qt 6.0.0

Browse Source 
Change-Id: If2ebc32c8057d1f614fd8d3749be97c923453585
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-07-22 19:49:46 +02:00
parent 024dbd18b6
commit c30a695784
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/advanceddockingsystem/elidinglabel.cpp
View File

@@ -138,11 +138,7 @@ namespace ADS {
bool ElidingLabel::hasPixmap() const
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return !pixmap().isNull();
#else
return pixmap() != nullptr;
#endif
}
QSize ElidingLabel::minimumSizeHint() const

4
src/libs/advanceddockingsystem/floatingdockcontainer.cpp
View File

@@ -623,11 +623,7 @@ static const char* windowsMessageString(int messageId)
}
#ifdef Q_OS_WIN
# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool FloatingDockContainer::nativeEvent(const QByteArray &eventType, void *message, long *result)
# else
bool FloatingDockContainer::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
# endif
{
QWidget::nativeEvent(eventType, message, result);
MSG *msg = static_cast<MSG *>(message);

4
src/libs/advanceddockingsystem/floatingdockcontainer.h
View File

@@ -196,12 +196,8 @@ protected: // reimplements QWidget
/**
* Native event filter for handling WM_MOVING messages on Windows
*/
# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
# else
bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
#endif
#endif
public:
using Super = QWidget;