From f805d7075a86775eccb3a153ffe7e874b103ee4d Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 25 Mar 2016 22:26:36 +0100
Subject: Fix QtGui dependencies in tests/benchmarks

Before this change, -no-gui builds failed already while running qmake.

Change-Id: I3e300a16669371098589822806c5cf8aa9b801c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 .../corelib/kernel/qcoreapplication/qcoreapplication.pro          | 2 +-
 tests/benchmarks/corelib/kernel/qvariant/qvariant.pro             | 1 +
 tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp         | 8 +++++++-
 .../network/access/qnetworkdiskcache/qnetworkdiskcache.pro        | 3 +--
 .../access/qnetworkreply_from_cache/qnetworkreply_from_cache.pro  | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'tests/benchmarks')

diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro
index df5450f88d..9efce76641 100644
--- a/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro
+++ b/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro
@@ -1,4 +1,4 @@
-QT += testlib
+QT = core testlib
 
 TEMPLATE = app
 TARGET = tst_bench_qcoreapplication
diff --git a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro
index afacbd2c2b..f05fa94b35 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 1268ede746..5ab209561c 100644
--- a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -32,7 +32,9 @@
 ****************************************************************************/
 
 #include <QtCore>
-#include <QtGui/QPixmap>
+#ifdef QT_GUI_LIB
+#  include <QtGui/QPixmap>
+#endif
 #include <qtest.h>
 
 #define ITERATION_COUNT 1e5
@@ -47,7 +49,9 @@ private slots:
     void floatVariantCreation();
     void rectVariantCreation();
     void stringVariantCreation();
+#ifdef QT_GUI_LIB
     void pixmapVariantCreation();
+#endif
     void stringListVariantCreation();
     void bigClassVariantCreation();
     void smallClassVariantCreation();
@@ -158,10 +162,12 @@ void tst_qvariant::stringVariantCreation()
     variantCreation<QString>(QString());
 }
 
+#ifdef QT_GUI_LIB
 void tst_qvariant::pixmapVariantCreation()
 {
     variantCreation<QPixmap>(QPixmap());
 }
+#endif
 
 void tst_qvariant::stringListVariantCreation()
 {
diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
index 226c123a72..8c443dadea 100644
--- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
+++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
@@ -1,8 +1,7 @@
 TEMPLATE = app
 TARGET = tst_bench_qnetworkdiskcache
 
-QT += gui # for QDesktopServices
-QT += network testlib
+QT = core network testlib
 
 CONFIG += release
 
diff --git a/tests/benchmarks/network/access/qnetworkreply_from_cache/qnetworkreply_from_cache.pro b/tests/benchmarks/network/access/qnetworkreply_from_cache/qnetworkreply_from_cache.pro
index bd3b34473f..e1fabffe4d 100644
--- a/tests/benchmarks/network/access/qnetworkreply_from_cache/qnetworkreply_from_cache.pro
+++ b/tests/benchmarks/network/access/qnetworkreply_from_cache/qnetworkreply_from_cache.pro
@@ -1,3 +1,3 @@
 TARGET = tst_bench_qnetworkreply_from_cache
-QT += network testlib
+QT = core network testlib
 SOURCES += tst_qnetworkreply_from_cache.cpp
-- 
cgit v1.2.3