diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-04 08:59:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-04 08:59:18 +0200 |
| commit | 216f57ef8682f74b72ae4e39cf1fd23abddf6a51 (patch) | |
| tree | 9d1dc12e0944ec0252dac843fbadaf1dc4693888 /tests/benchmarks/corelib/kernel/qvariant | |
| parent | 36bc2477753d19a14c587b97d4ec4f263e9e16c0 (diff) | |
| parent | 8ce657d0279566ef327af1b88339534041ddc012 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I35ca979395620e104e50b06366d0869433a4ffc2
Diffstat (limited to 'tests/benchmarks/corelib/kernel/qvariant')
| -rw-r--r-- | tests/benchmarks/corelib/kernel/qvariant/qvariant.pro | 1 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro index 8ea7200d53..8a8e9f25d3 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro +++ b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro @@ -1,5 +1,6 @@ TARGET = tst_bench_qvariant QT += testlib +!qtHaveModule(gui): QT -= gui CONFIG += release #CONFIG += debug diff --git a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp index 1d4d840ec1..9abb9466df 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp @@ -27,7 +27,9 @@ ****************************************************************************/ #include <QtCore> -#include <QtGui/QPixmap> +#ifdef QT_GUI_LIB +# include <QtGui/QPixmap> +#endif #include <qtest.h> #define ITERATION_COUNT 1e5 @@ -42,7 +44,9 @@ private slots: void floatVariantCreation(); void rectVariantCreation(); void stringVariantCreation(); +#ifdef QT_GUI_LIB void pixmapVariantCreation(); +#endif void stringListVariantCreation(); void bigClassVariantCreation(); void smallClassVariantCreation(); @@ -153,10 +157,12 @@ void tst_qvariant::stringVariantCreation() variantCreation<QString>(QString()); } +#ifdef QT_GUI_LIB void tst_qvariant::pixmapVariantCreation() { variantCreation<QPixmap>(QPixmap()); } +#endif void tst_qvariant::stringListVariantCreation() { |