summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/corelib/kernel/qobject
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-07-21 14:42:46 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2011-07-21 14:42:46 +0200
commit7b3b6b5afaaf1db1bfbfa9b56fa7b955a61344bd (patch)
tree8be0d601853d021434e03cef9a9cfd64b3708e92 /tests/benchmarks/corelib/kernel/qobject
parent070fc2f694beaa56fc191f1a3f6a1b9812f4ed35 (diff)
parent56defa4725508608a85e2813b85af3a7fcefefa0 (diff)
Merge remote branch 'gerrit/master' into refactor
Conflicts: examples/opengl/cube/main.cpp examples/widgets/applicationicon/main.cpp examples/widgets/orientation/main.cpp src/gui/image/qicon.cpp src/gui/image/qimage.h src/gui/image/qpixmap.h src/gui/image/qpixmap_mac.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qpalette.cpp src/gui/kernel/qwidget.cpp src/gui/styles/qmacstyle_mac.mm src/gui/widgets/qmenubar.cpp src/gui/widgets/qslider.cpp src/opengl/qwindowsurface_gl.cpp tests/auto/qvariant/qvariant.pro tests/benchmarks/corelib/kernel/qobject/qobject.pro tests/benchmarks/gui/animation/qanimation/qanimation.pro tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro tests/benchmarks/gui/image/qimagereader/qimagereader.pro tests/benchmarks/gui/itemviews/qtableview/qtableview.pro tests/benchmarks/gui/kernel/qapplication/qapplication.pro tests/benchmarks/gui/kernel/qwidget/qwidget.pro tests/benchmarks/gui/painting/qpainter/qpainter.pro tests/benchmarks/gui/painting/qtbench/qtbench.pro tests/benchmarks/gui/painting/qtracebench/qtracebench.pro tests/benchmarks/gui/text/qtext/qtext.pro Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
Diffstat (limited to 'tests/benchmarks/corelib/kernel/qobject')
-rw-r--r--tests/benchmarks/corelib/kernel/qobject/qobject.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro
index 37a06ad8f9..991c965f56 100644
--- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro
+++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro
@@ -1,5 +1,9 @@
load(qttest_p4)
QT += widgets
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qobject
DEPENDPATH += .