diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-02 13:25:04 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-09-12 14:23:15 +0000 |
commit | 4cb8667d20ff9f4af1451c54560ea864630f49b9 (patch) | |
tree | 800c187243f86e5e655c261ff895f519ffe43bb2 /src/qtdiag | |
parent | 1ace238ce0347857a5ba55d6fa30ba81fed204b9 (diff) |
Fix problems when building with -no-feature-process
Guard the QProcess includes, modernize some ifdefs, exclude tests and
examples that don't work without processes, and use QT_CONFIG(process)
rather than QT_BOOTSTRAPPED as discriminator where we are actually
checking for QProcess support. Also, don't try to build linguist and
designer without QProcess.
Change-Id: I4e1c7485a96ff02f2f6241113add35e44dc54b1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/qtdiag')
-rw-r--r-- | src/qtdiag/qtdiag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp index 0d351b256..d07921d07 100644 --- a/src/qtdiag/qtdiag.cpp +++ b/src/qtdiag/qtdiag.cpp @@ -418,7 +418,7 @@ QString qtDiag(unsigned flags) #endif str << '\n'; -#ifndef QT_NO_PROCESS +#if QT_CONFIG(process) const QProcessEnvironment systemEnvironment = QProcessEnvironment::systemEnvironment(); str << "\nEnvironment:\n"; const QStringList keys = systemEnvironment.keys(); @@ -426,7 +426,7 @@ QString qtDiag(unsigned flags) if (key.startsWith(QLatin1Char('Q'))) str << " " << key << "=\"" << systemEnvironment.value(key) << "\"\n"; } -#endif // !QT_NO_PROCESS +#endif // QT_CONFIG(process) const QByteArrayList features = qtFeatures(); if (!features.isEmpty()) |