Auto tests: remove PlatformQuirks::isAutoMaximizing()
Use QStyleHints::showIsFullScreen() where necessary. Notice that QWidget::show() already calls showFullScreen() if appropriate, and Qt::X11BypassWindowManagerHint doesn't do anything in the XCB platform plugin. Change-Id: Ib8f61188c075170d646894388561cbb3f72daee8 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
This commit is contained in:
J-P Nurmi
The Qt Project
parent
8b032fe423
commit
54d18cdc29
@ -51,18 +51,6 @@
|
||||
|
||||
struct PlatformQuirks
|
||||
{
|
||||
/* Some windowing systems automatically maximize apps on startup (e.g. Maemo)
|
||||
"Normal" fixed-sized windows do not work, the WM ignores their size settings.
|
||||
*/
|
||||
static inline bool isAutoMaximizing()
|
||||
{
|
||||
#if defined(Q_WS_X11)
|
||||
return X11->desktopEnvironment == DE_MEEGO_COMPOSITOR;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline bool haveMouseCursor()
|
||||
{
|
||||
#if defined(Q_WS_X11)
|
||||
|
||||
@ -50,7 +50,6 @@
|
||||
#include <QtWidgets/qstyleoption.h>
|
||||
|
||||
#include <private/qgraphicseffect_p.h>
|
||||
#include "../../../platformquirks.h"
|
||||
|
||||
class tst_QGraphicsEffect : public QObject
|
||||
{
|
||||
@ -703,10 +702,7 @@ void tst_QGraphicsEffect::prepareGeometryChangeInvalidateCache()
|
||||
scene.addItem(item);
|
||||
|
||||
QGraphicsView view(&scene);
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
view.showFullScreen();
|
||||
else
|
||||
view.show();
|
||||
view.show();
|
||||
qApp->setActiveWindow(&view);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&view));
|
||||
QTRY_VERIFY(item->nbPaint >= 1);
|
||||
|
||||
@ -65,6 +65,7 @@
|
||||
#include <QLineEdit>
|
||||
#include <QGraphicsLinearLayout>
|
||||
#include <float.h>
|
||||
#include <QStyleHints>
|
||||
|
||||
Q_DECLARE_METATYPE(QList<int>)
|
||||
Q_DECLARE_METATYPE(QList<QRectF>)
|
||||
@ -72,6 +73,8 @@ Q_DECLARE_METATYPE(QPainterPath)
|
||||
Q_DECLARE_METATYPE(QPointF)
|
||||
Q_DECLARE_METATYPE(QRectF)
|
||||
|
||||
#include "../../../platformquirks.h"
|
||||
|
||||
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
|
||||
#include <windows.h>
|
||||
#define Q_CHECK_PAINTEVENTS \
|
||||
@ -89,8 +92,6 @@ Q_DECLARE_METATYPE(QRectF)
|
||||
#define COMPARE_REGIONS QTRY_COMPARE
|
||||
#endif
|
||||
|
||||
#include "../../../platformquirks.h"
|
||||
|
||||
static QGraphicsRectItem staticItem; //QTBUG-7629, we should not crash at exit.
|
||||
|
||||
static void sendMousePress(QGraphicsScene *scene, const QPointF &point, Qt::MouseButton button = Qt::LeftButton)
|
||||
@ -5067,11 +5068,7 @@ void tst_QGraphicsItem::paint()
|
||||
scene.addItem(&paintTester);
|
||||
|
||||
QGraphicsView view(&scene);
|
||||
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
view.showFullScreen();
|
||||
else
|
||||
view.show();
|
||||
view.show();
|
||||
QVERIFY(QTest::qWaitForWindowExposed(&view));
|
||||
QApplication::processEvents();
|
||||
#ifdef Q_OS_WIN32
|
||||
@ -6706,10 +6703,7 @@ void tst_QGraphicsItem::opacity2()
|
||||
scene.addItem(parent);
|
||||
|
||||
MyGraphicsView view(&scene);
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
view.showFullScreen();
|
||||
else
|
||||
view.show();
|
||||
view.show();
|
||||
QVERIFY(QTest::qWaitForWindowActive(&view));
|
||||
QTRY_VERIFY(view.repaints >= 1);
|
||||
|
||||
@ -8064,7 +8058,7 @@ void tst_QGraphicsItem::sorting_data()
|
||||
|
||||
void tst_QGraphicsItem::sorting()
|
||||
{
|
||||
if (PlatformQuirks::isAutoMaximizing())
|
||||
if (qGuiApp->styleHints()->showIsFullScreen())
|
||||
QSKIP("Skipped because Platform is auto maximizing");
|
||||
|
||||
_paintedItems.clear();
|
||||
@ -10853,10 +10847,7 @@ void tst_QGraphicsItem::QTBUG_6738_missingUpdateWithSetParent()
|
||||
scene.addItem(parent);
|
||||
|
||||
MyGraphicsView view(&scene);
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
view.showFullScreen();
|
||||
else
|
||||
view.show();
|
||||
view.show();
|
||||
qApp->setActiveWindow(&view);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&view));
|
||||
QTRY_VERIFY(view.repaints > 0);
|
||||
@ -10905,10 +10896,7 @@ void tst_QGraphicsItem::QT_2653_fullUpdateDiscardingOpacityUpdate()
|
||||
// ItemIgnoresTransformations, ItemClipsChildrenToShape, ItemIsSelectable
|
||||
parentGreen->setFlag(QGraphicsItem::ItemIgnoresTransformations);
|
||||
|
||||
if (PlatformQuirks::isAutoMaximizing())
|
||||
view.showFullScreen();
|
||||
else
|
||||
view.show();
|
||||
view.show();
|
||||
QVERIFY(QTest::qWaitForWindowActive(&view));
|
||||
view.reset();
|
||||
|
||||
@ -11093,10 +11081,7 @@ void tst_QGraphicsItem::doNotMarkFullUpdateIfNotInScene()
|
||||
item3->setParentItem(item2);
|
||||
item2->setParentItem(item);
|
||||
scene.addItem(item);
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
view.showFullScreen();
|
||||
else
|
||||
view.show();
|
||||
view.show();
|
||||
QTest::qWaitForWindowActive(view.windowHandle());
|
||||
view.activateWindow();
|
||||
QTRY_VERIFY(view.isActiveWindow());
|
||||
|
||||
@ -425,8 +425,6 @@ void tst_QGraphicsView::interactive()
|
||||
scene.addItem(item);
|
||||
|
||||
QGraphicsView view(&scene);
|
||||
if (PlatformQuirks::isAutoMaximizing())
|
||||
view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
|
||||
view.setFixedSize(300, 300);
|
||||
QCOMPARE(item->events.size(), 0);
|
||||
view.show();
|
||||
@ -1288,9 +1286,6 @@ void tst_QGraphicsView::fitInView()
|
||||
view.setFixedSize(400, 200);
|
||||
#endif
|
||||
|
||||
if (PlatformQuirks::isAutoMaximizing())
|
||||
view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
|
||||
|
||||
view.show();
|
||||
view.fitInView(scene.itemsBoundingRect(), Qt::IgnoreAspectRatio);
|
||||
qApp->processEvents();
|
||||
@ -1518,8 +1513,6 @@ void tst_QGraphicsView::itemsInRect_cosmeticAdjust()
|
||||
QGraphicsView view(&scene);
|
||||
view.setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing, !adjustForAntialiasing);
|
||||
view.setRenderHint(QPainter::Antialiasing, adjustForAntialiasing);
|
||||
if (PlatformQuirks::isAutoMaximizing())
|
||||
view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
|
||||
view.setFrameStyle(0);
|
||||
view.resize(300, 300);
|
||||
view.show();
|
||||
@ -2328,8 +2321,6 @@ void tst_QGraphicsView::viewportUpdateMode()
|
||||
QDesktopWidget desktop;
|
||||
view.setFixedSize(QSize(500, 500).boundedTo(desktop.availableGeometry().size())); // 500 is too big for all common smartphones
|
||||
view.setScene(&scene);
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
|
||||
QCOMPARE(view.viewportUpdateMode(), QGraphicsView::MinimalViewportUpdate);
|
||||
|
||||
// Show the view, and initialize our test.
|
||||
@ -4489,8 +4480,6 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect()
|
||||
scene.addItem(&item);
|
||||
|
||||
QGraphicsView view(&scene);
|
||||
if (PlatformQuirks::isAutoMaximizing())
|
||||
view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
|
||||
view.scale(4.15, 4.15);
|
||||
view.show();
|
||||
qApp->setActiveWindow(&view);
|
||||
|
||||
@ -52,7 +52,6 @@
|
||||
#include <qboxlayout.h>
|
||||
#include <qaction.h>
|
||||
#include <qwidgetaction.h>
|
||||
#include "../../../platformquirks.h"
|
||||
|
||||
|
||||
class EventSpy : public QObject
|
||||
@ -3128,10 +3127,7 @@ void tst_QGraphicsWidget::initialShow()
|
||||
MyGraphicsWidget *widget = new MyGraphicsWidget;
|
||||
|
||||
QGraphicsView view(&scene);
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
view.showFullScreen();
|
||||
else
|
||||
view.show();
|
||||
view.show();
|
||||
qApp->setActiveWindow(&view);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&view));
|
||||
|
||||
|
||||
@ -54,8 +54,6 @@
|
||||
#include <QtWidgets/QWindowsStyle>
|
||||
#include <QStyleFactory>
|
||||
|
||||
#include "../../../platformquirks.h"
|
||||
|
||||
class tst_QGridLayout : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -667,8 +665,6 @@ void tst_QGridLayout::spacingsAndMargins()
|
||||
|
||||
QApplication::setStyle(new Qt42Style);
|
||||
QWidget toplevel;
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
toplevel.setWindowFlags(Qt::X11BypassWindowManagerHint);
|
||||
QVBoxLayout vbox(&toplevel);
|
||||
QGridLayout grid1;
|
||||
vbox.addLayout(&grid1);
|
||||
|
||||
@ -53,9 +53,9 @@
|
||||
#include <qpushbutton.h>
|
||||
#include <qlabel.h>
|
||||
#include <qtextedit.h>
|
||||
#include <qstylehints.h>
|
||||
#include <private/qmainwindowlayout_p.h>
|
||||
#include <private/qdockarealayout_p.h>
|
||||
#include "../../../platformquirks.h"
|
||||
|
||||
static uchar restoreData41[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x64, 0x0, 0x0, 0x1, 0x19, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x43, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0xd4, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x64, 0x0, 0x0, 0x1, 0x19, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x43, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0xd4, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x1, 0x89, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x0, 0x63, 0x0, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x5e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x1, 0x2a, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x1, 0x89, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x0, 0x63, 0x0, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x5e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x1, 0x2a, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0xc1, 0x0, 0x0, 0x1, 0x19};
|
||||
static uchar restoreData42[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x24, 0x0, 0x0, 0x2, 0x2b, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0xb6, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x87, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x1, 0xcd, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x98, 0x0, 0x0, 0x2, 0x2b, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0xb6, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x87, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x1, 0xcd, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x4, 0x4e, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x12, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x1, 0x16, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x2, 0x28, 0x0, 0x0, 0x1, 0x14, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x3, 0x40, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x4, 0x4e, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x12, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x1, 0x16, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x2, 0x28, 0x0, 0x0, 0x1, 0x14, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x3, 0x40, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x3, 0x8a, 0x0, 0x0, 0x2, 0x2b, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x8};
|
||||
@ -1683,7 +1683,7 @@ void tst_QMainWindow::addToolbarAfterShow()
|
||||
|
||||
void tst_QMainWindow::centralWidgetSize()
|
||||
{
|
||||
if(PlatformQuirks::isAutoMaximizing())
|
||||
if (qGuiApp->styleHints()->showIsFullScreen())
|
||||
QSKIP("The platform is auto maximizing, so the test makes no sense");;
|
||||
|
||||
QMainWindow mainWindow;
|
||||
|
||||
@ -61,8 +61,7 @@
|
||||
#include <QtOpenGL>
|
||||
#endif
|
||||
#include <QMacStyle>
|
||||
|
||||
#include "../../../platformquirks.h"
|
||||
#include <QStyleHints>
|
||||
|
||||
static const Qt::WindowFlags DefaultWindowFlags
|
||||
= Qt::SubWindow | Qt::WindowSystemMenuHint
|
||||
@ -502,7 +501,7 @@ void tst_QMdiArea::subWindowActivated2()
|
||||
QCOMPARE(mdiArea.activeSubWindow(), activeSubWindow);
|
||||
spy.clear();
|
||||
|
||||
if (PlatformQuirks::isAutoMaximizing())
|
||||
if (qGuiApp->styleHints()->showIsFullScreen())
|
||||
QSKIP("Platform is auto maximizing, so no showMinimized()");
|
||||
|
||||
// Check that we only emit _one_ signal and the active window
|
||||
@ -1576,8 +1575,6 @@ void tst_QMdiArea::tileSubWindows()
|
||||
{
|
||||
QMdiArea workspace;
|
||||
workspace.resize(600,480);
|
||||
if (PlatformQuirks::isAutoMaximizing())
|
||||
workspace.setWindowFlags(workspace.windowFlags() | Qt::X11BypassWindowManagerHint);
|
||||
workspace.show();
|
||||
QVERIFY(QTest::qWaitForWindowExposed(&workspace));
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user