diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /tests/benchmarks/corelib | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'tests/benchmarks/corelib')
| -rw-r--r-- | tests/benchmarks/corelib/kernel/qmetaobject/main.cpp | 2 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/kernel/qobject/main.cpp | 2 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/kernel/qobject/qobject.pro | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp b/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp index 79615c67ff..4214a41f5c 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp +++ b/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtGui> +#include <QtWidgets/QTreeView> #include <qtest.h> class LotsOfSignals : public QObject diff --git a/tests/benchmarks/corelib/kernel/qobject/main.cpp b/tests/benchmarks/corelib/kernel/qobject/main.cpp index 33f1ac7d1c..7ca4144a19 100644 --- a/tests/benchmarks/corelib/kernel/qobject/main.cpp +++ b/tests/benchmarks/corelib/kernel/qobject/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtGui> +#include <QtWidgets/QTreeView> #include <qtest.h> #include "object.h" #include <qcoreapplication.h> diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro index f54fae5059..991c965f56 100644 --- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro +++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets # do not run benchmarks by default in 'make check' CONFIG -= testcase |