Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build fix for the case when QT_NO_STYLE_STYLESHEET is defined

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-02-26 21:56:12 +02:00
parent e6c7cf9300
commit 106c44d412
5 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp
View file

@ -132,10 +132,14 @@ void tst_QAbstractSpinBox::task183108_clear()
void tst_QAbstractSpinBox::task228728_cssselector() void tst_QAbstractSpinBox::task228728_cssselector()
{ {
#ifndef QT_NO_STYLE_STYLESHEET
//QAbstractSpinBox does some call to stylehint into his constructor. //QAbstractSpinBox does some call to stylehint into his constructor.
//so while the stylesheet want to access property, it should not crash //so while the stylesheet want to access property, it should not crash
qApp->setStyleSheet("[alignment=\"1\"], [text=\"foo\"] { color:black; }" ); qApp->setStyleSheet("[alignment=\"1\"], [text=\"foo\"] { color:black; }" );
QSpinBox box; QSpinBox box;
#else // QT_NO_STYLE_STYLESHEET
QSKIP("Katie compiled without stylesheet support (QT_NO_STYLE_STYLESHEET)", SkipAll);
#endif // QT_NO_STYLE_STYLESHEET
} }
QTEST_MAIN(tst_QAbstractSpinBox) QTEST_MAIN(tst_QAbstractSpinBox)

9
tests/auto/qmainwindow/tst_qmainwindow.cpp
View file

@ -1429,7 +1429,7 @@ void tst_QMainWindow::restoreStateDockWidgetBug()
{ {
QByteArray state; QByteArray state;
//save state // save state
{ {
QMainWindow mw1; QMainWindow mw1;
QDockWidget *dw1 = new QDockWidget(); QDockWidget *dw1 = new QDockWidget();
@ -1444,14 +1444,16 @@ void tst_QMainWindow::restoreStateDockWidgetBug()
state = mw1.saveState(); state = mw1.saveState();
} }
//restore state // restore state
QMainWindow mw2; QMainWindow mw2;
QDockWidget *dw2 = new QDockWidget(); QDockWidget *dw2 = new QDockWidget();
dw2->setObjectName("Left DockWidget"); dw2->setObjectName("Left DockWidget");
mw2.addDockWidget(Qt::LeftDockWidgetArea, dw2); mw2.addDockWidget(Qt::LeftDockWidgetArea, dw2);
mw2.setCentralWidget(new QTextEdit()); mw2.setCentralWidget(new QTextEdit());
mw2.restoreState(state); mw2.restoreState(state);
#ifndef QT_NO_STYLE_STYLESHEET
mw2.setStyleSheet("color:red"); mw2.setStyleSheet("color:red");
#endif // QT_NO_STYLE_STYLESHEET
mw2.show(); mw2.show();
QApplication::processEvents(); QApplication::processEvents();
@ -1936,7 +1938,7 @@ void tst_QMainWindow::QTBUG2774_stylechange()
QVERIFY( mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height()))); QVERIFY( mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height())));
QVERIFY(!mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height() + 30))); QVERIFY(!mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height() + 30)));
#ifndef QT_NO_STYLE_STYLESHEET
{ {
QTest::qWait(1000); QTest::qWait(1000);
mw.setStyleSheet("QMainWindow::separator { width: 50px; height:50px; }"); mw.setStyleSheet("QMainWindow::separator { width: 50px; height:50px; }");
@ -1954,6 +1956,7 @@ void tst_QMainWindow::QTBUG2774_stylechange()
QVERIFY(!mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height()))); QVERIFY(!mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height())));
QVERIFY(!mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height() + 1))); QVERIFY(!mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height() + 1)));
} }
#endif // QT_NO_STYLE_STYLESHEET
} }
void tst_QMainWindow::QTBUG21378_animationFinished() void tst_QMainWindow::QTBUG21378_animationFinished()

6
tests/auto/qmenu/tst_qmenu.cpp
View file

@ -568,10 +568,14 @@ void tst_QMenu::layoutDirection()
void tst_QMenu::task208001_stylesheet() void tst_QMenu::task208001_stylesheet()
{ {
//test if it crash #ifndef QT_NO_STYLE_STYLESHEET
// test if it crash
QMainWindow main; QMainWindow main;
main.setStyleSheet("QMenu [title =\"File\"] { color: red;}"); main.setStyleSheet("QMenu [title =\"File\"] { color: red;}");
main.menuBar()->addMenu("File"); main.menuBar()->addMenu("File");
#else // QT_NO_STYLE_STYLESHEET
QSKIP("Katie compiled without stylesheet support (QT_NO_STYLE_STYLESHEET)", SkipAll);
#endif // QT_NO_STYLE_STYLESHEET
} }
void tst_QMenu::activeSubMenuPosition() void tst_QMenu::activeSubMenuPosition()

12
tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
View file

@ -27,8 +27,10 @@
#include <qstylesheetstyle_p.h> #include <qstylesheetstyle_p.h>
//TESTED_CLASS= // TESTED_CLASS=
//TESTED_FILES= // TESTED_FILES=
#ifndef QT_NO_STYLE_STYLESHEET
class tst_QStyleSheetStyle : public QObject class tst_QStyleSheetStyle : public QObject
{ {
@ -1625,3 +1627,9 @@ void tst_QStyleSheetStyle::QTBUG15910_crashNullWidget()
QTEST_MAIN(tst_QStyleSheetStyle) QTEST_MAIN(tst_QStyleSheetStyle)
#include "moc_tst_qstylesheetstyle.cpp" #include "moc_tst_qstylesheetstyle.cpp"
#else // QT_NO_STYLE_STYLESHEET
QTEST_NOOP_MAIN
#endif // QT_NO_STYLE_STYLESHEET

8
tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
View file

@ -23,6 +23,8 @@
#include <QtGui> #include <QtGui>
#include <qtest.h> #include <qtest.h>
#ifndef QT_NO_STYLE_STYLESHEET
class tst_qstylesheetstyle : public QObject class tst_qstylesheetstyle : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -172,3 +174,9 @@ void tst_qstylesheetstyle::grid()
QTEST_MAIN(tst_qstylesheetstyle) QTEST_MAIN(tst_qstylesheetstyle)
#include "moc_main.cpp" #include "moc_main.cpp"
#else // QT_NO_STYLE_STYLESHEET
QTEST_NOOP_MAIN
#endif // QT_NO_STYLE_STYLESHEET