diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-07-10 11:26:19 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-07-11 20:28:26 +0000 |
| commit | d294f917581552b968a8959a7f8f50c94db7cd01 (patch) | |
| tree | 5f2fec8da86316b070602b358118dee26be3da59 /src/app | |
| parent | 2a197ed9bf6f0b959048e1835054352d7e6e5bf0 (diff) | |
main: Remove unused variable
This amends commit a6c17fc5371451b792a709ca142d28b16d3e610f.
Change-Id: I365513a9e11e6c07310799f87a4e299cd110dcf3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 374ae667497..c1ae3245fb0 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -157,9 +157,8 @@ static inline int askMsgSendFailed() QMessageBox::Retry); } -static const char *setHighDpiEnvironmentVariable() +static void setHighDpiEnvironmentVariable() { - const char* envVarName = 0; static const char ENV_VAR_QT_DEVICE_PIXEL_RATIO[] = "QT_DEVICE_PIXEL_RATIO"; if (Utils::HostOsInfo().isWindowsHost() && !qEnvironmentVariableIsSet(ENV_VAR_QT_DEVICE_PIXEL_RATIO) // legacy in 5.6, but still functional @@ -168,7 +167,6 @@ static const char *setHighDpiEnvironmentVariable() && !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); } - return envVarName; } // taken from utils/fileutils.cpp. We can not use utils here since that depends app_version.h. @@ -304,7 +302,7 @@ int main(int argc, char **argv) Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + "/QtCreator-XXXXXX"); - const char *highDpiEnvironmentVariable = setHighDpiEnvironmentVariable(); + setHighDpiEnvironmentVariable(); QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false\nqtc.*.info=false")); @@ -322,9 +320,6 @@ int main(int argc, char **argv) loadFonts(); - if (highDpiEnvironmentVariable) - qunsetenv(highDpiEnvironmentVariable); - if (Utils::HostOsInfo().isWindowsHost() && !qFuzzyCompare(qApp->devicePixelRatio(), 1.0) && QApplication::style()->objectName().startsWith( |