We depend against 5.7
This commit is contained in:
parent
d3ed3bcbbf
commit
5d9aa6816f
@ -95,7 +95,6 @@ void DialogNativeTest::position()
|
||||
QCOMPARE(m_dialog->x(), 0);
|
||||
QCOMPARE(m_dialog->y(), 49);
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
|
||||
m_dialog->setVisualParent(m_panel2->contentItem());
|
||||
QCOMPARE(m_dialog->x(), 69);
|
||||
QCOMPARE(m_dialog->y(), 49);
|
||||
@ -104,7 +103,6 @@ void DialogNativeTest::position()
|
||||
m_dialog->setVisualParent(m_content2);
|
||||
QCOMPARE(m_dialog->x(), 169);
|
||||
QCOMPARE(m_dialog->y(), 24);
|
||||
#endif
|
||||
}
|
||||
|
||||
QTEST_MAIN(DialogNativeTest)
|
||||
|
@ -37,9 +37,6 @@ void DialogStateTest::cleanupTestCase()
|
||||
|
||||
void DialogStateTest::windowState()
|
||||
{
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
|
||||
QSKIP("This test is broken with Qt 5.5");
|
||||
#endif
|
||||
for (int i = 0; i <= 100; ++i) {
|
||||
m_dialog->show();
|
||||
|
||||
|
@ -122,12 +122,9 @@ public:
|
||||
void updateTexture(const QSize &size, const QString &elementId)
|
||||
{
|
||||
QQuickWindow::CreateTextureOptions options;
|
||||
//Qt < 5.3.2. has a crash on some atlas textures
|
||||
#if (QT_VERSION > QT_VERSION_CHECK(5, 3, 2))
|
||||
if (m_fitMode != Tile) {
|
||||
options = QQuickWindow::TextureCanUseAtlas;
|
||||
}
|
||||
#endif
|
||||
setTexture(s_cache->loadTexture(m_frameSvg->window(), m_frameSvg->frameSvg()->image(size, elementId), options));
|
||||
}
|
||||
|
||||
|
@ -22,9 +22,7 @@
|
||||
#include <QQmlEngine>
|
||||
#include <QQuickItem>
|
||||
#include <QDebug>
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
|
||||
#include <QPlatformSurfaceEvent>
|
||||
#endif
|
||||
|
||||
#include <kdeclarative/qmlobjectsharedengine.h>
|
||||
#include <KWindowSystem>
|
||||
|
@ -223,12 +223,7 @@ void WindowThumbnail::releaseResources()
|
||||
Q_ASSERT(m_glxPixmap == XCB_PIXMAP_NONE || m_image == EGL_NO_IMAGE_KHR);
|
||||
#endif
|
||||
#if HAVE_GLX || HAVE_EGL
|
||||
// NoStage is supported since Qt >= 5.6.x
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
|
||||
QQuickWindow::RenderStage m_renderStage = QQuickWindow::NoStage;
|
||||
#else
|
||||
QQuickWindow::RenderStage m_renderStage = QQuickWindow::BeforeSynchronizingStage;
|
||||
#endif
|
||||
QQuickWindow::RenderStage m_renderStage = QQuickWindow::NoStage;
|
||||
#endif
|
||||
|
||||
//data is deleted in the render thread (with relevant GLX calls)
|
||||
|
@ -272,6 +272,7 @@ QVariant ConfigModel::data(const QModelIndex &index, int role) const
|
||||
d->kcms[pluginName] = cm;
|
||||
return QVariant::fromValue(cm);
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
default:
|
||||
return QVariant();
|
||||
|
@ -34,9 +34,7 @@
|
||||
#include <QMenu>
|
||||
#include <QPointer>
|
||||
|
||||
#if (QT_VERSION > QT_VERSION_CHECK(5, 5, 0))
|
||||
#include <QPlatformSurfaceEvent>
|
||||
#endif
|
||||
|
||||
#include <kwindowsystem.h>
|
||||
#include <KWindowSystem/KWindowInfo>
|
||||
@ -1190,14 +1188,12 @@ bool Dialog::event(QEvent *event)
|
||||
d->updateTheme();
|
||||
}
|
||||
#endif
|
||||
#if (QT_VERSION > QT_VERSION_CHECK(5, 5, 0))
|
||||
} else if (event->type() == QEvent::PlatformSurface) {
|
||||
const QPlatformSurfaceEvent *pSEvent = static_cast<QPlatformSurfaceEvent *>(event);
|
||||
|
||||
if (pSEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {
|
||||
KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
|
||||
}
|
||||
#endif
|
||||
} else if (event->type() == QEvent::Show) {
|
||||
d->updateVisibility(true);
|
||||
} else if (event->type() == QEvent::Hide) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user