diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-21 15:19:40 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-22 19:52:26 +0100 |
commit | 37842c2fdb10b8802cae7ebeead7d4e356251053 (patch) | |
tree | 01b805e009ecee542cf0c391c2a484315ce6c4a9 /tests/manual/qgraphicslayout/flicker | |
parent | 4e07286a30fb58321f46a9fd0e0033f06bf9eb4d (diff) |
Compile most manual tests with Qt 4.
Replace <QtWidgets> includes by class includes, remove tests
that do not compile.
Change-Id: I52837e8c567dc8ac365c7d43c37beb9a368f6f72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/manual/qgraphicslayout/flicker')
-rw-r--r-- | tests/manual/qgraphicslayout/flicker/main.cpp | 3 | ||||
-rw-r--r-- | tests/manual/qgraphicslayout/flicker/window.h | 20 |
2 files changed, 21 insertions, 2 deletions
diff --git a/tests/manual/qgraphicslayout/flicker/main.cpp b/tests/manual/qgraphicslayout/flicker/main.cpp index 4b6589f9f8..2f4140e39a 100644 --- a/tests/manual/qgraphicslayout/flicker/main.cpp +++ b/tests/manual/qgraphicslayout/flicker/main.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <QtWidgets> +#include <QMainWindow> +#include <QApplication> #include "window.h" int main(int argc, char **argv) diff --git a/tests/manual/qgraphicslayout/flicker/window.h b/tests/manual/qgraphicslayout/flicker/window.h index 3a0eb77fcc..190e9c4890 100644 --- a/tests/manual/qgraphicslayout/flicker/window.h +++ b/tests/manual/qgraphicslayout/flicker/window.h @@ -43,7 +43,21 @@ #define WINDOW_H -#include <QtWidgets> +#include <QGraphicsScene> +#include <QGraphicsWidget> +#include <QGraphicsLinearLayout> +#include <QGraphicsView> +#include <QSpinBox> +#include <QCheckBox> +#include <QPushButton> +#include <QLabel> +#include <QHBoxLayout> +#include <QPainter> +#include <QApplication> +#include <QThread> +#include <QMap> +#include <QTime> +#include <QDebug> struct Statistics { Statistics() : setGeometryCount(0), sleepMsecs(0), output(0), @@ -57,7 +71,11 @@ struct Statistics { QLabel *output; void sleep() { +#if QT_VERSION >= 0x050000 QThread::msleep(sleepMsecs); +#else + qWarning("%s unimplemented", Q_FUNC_INFO); +#endif } int currentBenchmarkIteration; bool relayoutClicked; |