Require Qt 5.9
Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D8331icc-effect-5.14.5
parent
91d78daac4
commit
a5b17b2228
|
@ -4,7 +4,7 @@ project(KWIN)
|
|||
set(PROJECT_VERSION "5.11.90")
|
||||
set(PROJECT_VERSION_MAJOR 5)
|
||||
|
||||
set(QT_MIN_VERSION "5.7.0")
|
||||
set(QT_MIN_VERSION "5.9.0")
|
||||
set(KF5_MIN_VERSION "5.34.0")
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
|
||||
|
@ -250,13 +250,9 @@ set_package_properties(X11_XCB PROPERTIES
|
|||
TYPE OPTIONAL)
|
||||
|
||||
# dependencies for QPA plugin
|
||||
if(Qt5Core_VERSION VERSION_LESS "5.8.0")
|
||||
find_package(Qt5PlatformSupport REQUIRED)
|
||||
else()
|
||||
find_package(Qt5FontDatabaseSupport REQUIRED)
|
||||
find_package(Qt5ThemeSupport REQUIRED)
|
||||
find_package(Qt5EventDispatcherSupport REQUIRED)
|
||||
endif()
|
||||
find_package(Qt5FontDatabaseSupport REQUIRED)
|
||||
find_package(Qt5ThemeSupport REQUIRED)
|
||||
find_package(Qt5EventDispatcherSupport REQUIRED)
|
||||
|
||||
find_package(Freetype REQUIRED)
|
||||
set_package_properties(Freetype PROPERTIES DESCRIPTION "A font rendering engine"
|
||||
|
|
|
@ -281,9 +281,7 @@ QPixmap PlastikButtonProvider::icon(ButtonIcon icon, int size, bool active, bool
|
|||
drawObject(p, HorizontalLine, r.x()+(r.width()-lwMark)/2, r.y()+(r.height()-lwMark)/2, lwMark, lwMark);
|
||||
|
||||
// Fall through to OnAllDesktopsIcon intended!
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
|
||||
Q_FALLTHROUGH();
|
||||
#endif
|
||||
}
|
||||
case OnAllDesktopsIcon:
|
||||
{
|
||||
|
@ -309,9 +307,7 @@ QPixmap PlastikButtonProvider::icon(ButtonIcon icon, int size, bool active, bool
|
|||
drawObject(p, HorizontalLine, center-(lwArrow-2), r.y()+2*lwArrow, (lwArrow-2)*2, lwArrow);
|
||||
|
||||
// Fall through to KeepAboveIcon intended!
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
|
||||
Q_FALLTHROUGH();
|
||||
#endif
|
||||
}
|
||||
case KeepAboveIcon:
|
||||
{
|
||||
|
@ -337,9 +333,7 @@ QPixmap PlastikButtonProvider::icon(ButtonIcon icon, int size, bool active, bool
|
|||
drawObject(p, HorizontalLine, center-(lwArrow-2), r.bottom()-(lwArrow-1)-2*lwArrow, (lwArrow-2)*2, lwArrow);
|
||||
|
||||
// Fall through to KeepBelowIcon intended!
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
|
||||
Q_FALLTHROUGH();
|
||||
#endif
|
||||
}
|
||||
case KeepBelowIcon:
|
||||
{
|
||||
|
|
|
@ -116,9 +116,7 @@ OpenGLBackend *X11StandalonePlatform::createOpenGLBackend()
|
|||
} else {
|
||||
qCWarning(KWIN_X11STANDALONE) << "Glx not available, trying EGL instead.";
|
||||
// no break, needs fall-through
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
|
||||
Q_FALLTHROUGH();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
case EglPlatformInterface:
|
||||
|
@ -236,9 +234,7 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint)
|
|||
group.writeEntry(unsafeKey, true);
|
||||
group.sync();
|
||||
// Deliberately continue with PreFrame
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
|
||||
Q_FALLTHROUGH();
|
||||
#endif
|
||||
case OpenGLSafePoint::PreFrame:
|
||||
if (m_openGLFreezeProtectionThread == nullptr) {
|
||||
Q_ASSERT(m_openGLFreezeProtection == nullptr);
|
||||
|
@ -267,9 +263,7 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint)
|
|||
group.writeEntry(unsafeKey, false);
|
||||
group.sync();
|
||||
// Deliberately continue with PostFrame
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
|
||||
Q_FALLTHROUGH();
|
||||
#endif
|
||||
case OpenGLSafePoint::PostFrame:
|
||||
QMetaObject::invokeMethod(m_openGLFreezeProtection, "stop", Qt::QueuedConnection);
|
||||
break;
|
||||
|
|
|
@ -47,15 +47,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include <qpa/qwindowsysteminterface.h>
|
||||
#include <QtCore/private/qeventdispatcher_unix_p.h>
|
||||
|
||||
#if QT_VERSION >= 0x050800
|
||||
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
|
||||
#include <QtThemeSupport/private/qgenericunixthemes_p.h>
|
||||
#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h>
|
||||
#else
|
||||
#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
|
||||
#include <QtPlatformSupport/private/qgenericunixthemes_p.h>
|
||||
#include <QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h>
|
||||
#endif
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
|
|
@ -448,9 +448,7 @@ void SceneOpenGL::initDebugOutput()
|
|||
if (strstr(message, "Buffer detailed info:") && strstr(message, "has been updated"))
|
||||
scheduleVboReInit();
|
||||
// fall through! for general message printing
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
|
||||
Q_FALLTHROUGH();
|
||||
#endif
|
||||
case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
|
||||
case GL_DEBUG_TYPE_PORTABILITY:
|
||||
case GL_DEBUG_TYPE_PERFORMANCE:
|
||||
|
|
Loading…
Reference in New Issue