diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2023-12-01 16:00:30 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-12-04 15:48:32 +0000 |
commit | 11dfa4a5f0371f87091e577ffb518e2f8791f9bb (patch) | |
tree | 9348fc63e31c6a1b31ac2dc21c2c4bbd9b249d6b | |
parent | ba637cd74c3265b50cf1e6763e233444791fb75b (diff) |
qtdiag: only print "Q_" and "QT" environment variables
QEMU is not Qt:
Environment:
QEMU_AUDIO_DRV="pa"
QTEST_COLORED="1"
QT_AUTO_SCREEN_SCALE_FACTOR="0"
QT_FORCE_STDERR_LOGGING="1"
QT_IM_MODULE="xim"
QT_IM_SWITCHER="imsw-multi"
QT_MESSAGE_PATTERN="[%{time boot}] %{if-warning}%{endif}%{if-fatal}%{endif}%{if-critical}%{endif}%{appname}(%{pid} %{threadid})(%{function}):%{if-category} %{category}:%{endif} %{message}"
QT_SCALE_FACTOR_ROUNDING_POLICY="Floor"
QT_SCREEN_SCALE_FACTORS="2;2"
Change-Id: Iae41eb8991e349ceb836fffd179cbd3d757614cf
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 27823a51a9ca8c724efee46b722f484d08cde962)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/qtdiag/qtdiag.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp index 1415034b7..217d4596d 100644 --- a/src/qtdiag/qtdiag.cpp +++ b/src/qtdiag/qtdiag.cpp @@ -601,8 +601,10 @@ QString qtDiag(unsigned flags) str << "\nEnvironment:\n"; const QStringList keys = systemEnvironment.keys(); for (const QString &key : keys) { - if (key.startsWith(QLatin1Char('Q'))) - str << " " << key << "=\"" << systemEnvironment.value(key) << "\"\n"; + if (key.size() < 2 || !key.startsWith(QLatin1Char('Q'))) + continue; + if (key.at(1) == 'T' || key.at(1) == '_') + str << " " << key << "=\"" << systemEnvironment.value(key) << "\"\n"; } #endif // QT_CONFIG(process) |