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

build fix for the case when QT_NO_DIAL is defined

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-02-24 23:55:39 +02:00
parent ef664b3152
commit 3811ce0aef
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/global/qconfig.h.cmake
View file

@ -96,6 +96,9 @@
// #cmakedefine QT_NO_COMPLETER // #cmakedefine QT_NO_COMPLETER
// #cmakedefine QT_NO_CONTEXTMENU // #cmakedefine QT_NO_CONTEXTMENU
// #cmakedefine QT_NO_CSSPARSER // #cmakedefine QT_NO_CSSPARSER
// #cmakedefine QT_NO_DATESTRING
// #cmakedefine QT_NO_DATETIMEEDIT
// #cmakedefine QT_NO_DEBUG_STREAM
// Misc // Misc
#cmakedefine QT_NO_USING_NAMESPACE #cmakedefine QT_NO_USING_NAMESPACE
@ -106,11 +109,7 @@
#cmakedefine QT_NO_CONCURRENT #cmakedefine QT_NO_CONCURRENT
#cmakedefine QT_NO_CURSOR #cmakedefine QT_NO_CURSOR
#cmakedefine QT_NO_DATAWIDGETMAPPER #cmakedefine QT_NO_DATAWIDGETMAPPER
#cmakedefine QT_NO_DATESTRING
#cmakedefine QT_NO_DATETIMEEDIT
#cmakedefine QT_NO_DEBUG #cmakedefine QT_NO_DEBUG
#cmakedefine QT_NO_DEBUG_PLUGIN_CHECK
#cmakedefine QT_NO_DEBUG_STREAM
#cmakedefine QT_NO_DIAL #cmakedefine QT_NO_DIAL
#cmakedefine QT_NO_DIALOGBUTTONBOX #cmakedefine QT_NO_DIALOGBUTTONBOX
#cmakedefine QT_NO_DIRMODEL #cmakedefine QT_NO_DIRMODEL

4
tests/auto/qboxlayout/tst_qboxlayout.cpp
View file

@ -198,6 +198,9 @@ void tst_QBoxLayout::sizeConstraints()
void tst_QBoxLayout::setGeometry() void tst_QBoxLayout::setGeometry()
{ {
#ifdef QT_NO_DIAL
QSKIP("Katie compiled without dial support (QT_NO_DIAL)", SkipAll);
#else
QWidget toplevel; QWidget toplevel;
QWidget w(&toplevel); QWidget w(&toplevel);
QVBoxLayout *lay = new QVBoxLayout; QVBoxLayout *lay = new QVBoxLayout;
@ -215,6 +218,7 @@ void tst_QBoxLayout::setGeometry()
QRect newGeom(0, 0, 70, 70); QRect newGeom(0, 0, 70, 70);
lay2->setGeometry(newGeom); lay2->setGeometry(newGeom);
QVERIFY2(newGeom.contains(dial->geometry()), "dial->geometry() should be smaller and within newGeom"); QVERIFY2(newGeom.contains(dial->geometry()), "dial->geometry() should be smaller and within newGeom");
#endif // QT_NO_DIAL
} }
void tst_QBoxLayout::setStyleShouldChangeSpacing() void tst_QBoxLayout::setStyleShouldChangeSpacing()

8
tests/auto/qdial/tst_qdial.cpp
View file

@ -24,6 +24,8 @@
#include <QDial> #include <QDial>
#ifndef QT_NO_DIAL
class tst_QDial : public QObject class tst_QDial : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -190,3 +192,9 @@ void tst_QDial::wrappingCheck()
QTEST_MAIN(tst_QDial) QTEST_MAIN(tst_QDial)
#include "moc_tst_qdial.cpp" #include "moc_tst_qdial.cpp"
#else
QTEST_NOOP_MAIN
#endif // QT_NO_DIAL

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

@ -1824,7 +1824,7 @@ class MainWindow : public QMainWindow {
void tst_QMainWindow::setCursor() void tst_QMainWindow::setCursor()
{ {
#ifdef QT_NO_CURSOR #ifdef QT_NO_CURSOR
QSKIP("Qt compiled without cursor support(QT_NO_CURSOR)", SkipAll); QSKIP("Katie compiled without cursor support (QT_NO_CURSOR)", SkipAll);
#else #else
MainWindow mw; MainWindow mw;
QCursor cur = Qt::WaitCursor; QCursor cur = Qt::WaitCursor;