diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-02 11:50:00 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-02 14:05:45 +0000 |
| commit | 15cdea912b45d28c4d38c8a9f3cde8aab031e321 (patch) | |
| tree | bd3bcdbcd71cdcb032860f0c87c97f5e63129184 /tests | |
| parent | f8f4f3081cdac5bdc6eaa0d80e0e9b63868e6e11 (diff) | |
| download | qtlocation-15cdea912b45d28c4d38c8a9f3cde8aab031e321.tar.gz | |
Make tst_places compile with -no-feature-process
We already had a guard for QT_NO_PROCESS in place. Change that to the
safe form QT_CONFIG(process) and also guard the header inclusion.
Change-Id: I9c62024bd315a91da44e0492f0c8aa095de76dab
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/nokia_services/places_semiauto/tst_places.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/nokia_services/places_semiauto/tst_places.cpp b/tests/auto/nokia_services/places_semiauto/tst_places.cpp index 8e5289d4..2f68ab44 100644 --- a/tests/auto/nokia_services/places_semiauto/tst_places.cpp +++ b/tests/auto/nokia_services/places_semiauto/tst_places.cpp @@ -30,7 +30,9 @@ #include <QString> #include <QtTest/QtTest> +#if QT_CONFIG(process) #include <QtCore/QProcessEnvironment> +#endif #include <QtPositioning/QGeoCircle> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceEditorial> @@ -105,7 +107,7 @@ void tst_QPlaceManagerNokia::initTestCase() QVariantMap params; QStringList providers = QGeoServiceProvider::availableServiceProviders(); QVERIFY(providers.contains("here")); -#ifndef QT_NO_PROCESS +#if QT_CONFIG(process) QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); if (!(env.contains(AppIdEnv) && env.contains(TokenEnv))) |