feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

main: Remove unused variable

Browse Source 
This amends commit a6c17fc537.

Change-Id: I365513a9e11e6c07310799f87a4e299cd110dcf3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2017-07-10 11:26:19 +03:00
committed by Orgad Shaneh
parent 2a197ed9bf
commit d294f91758
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/main.cpp
View File

@@ -157,9 +157,8 @@ static inline int askMsgSendFailed()
QMessageBox::Retry); 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"; static const char ENV_VAR_QT_DEVICE_PIXEL_RATIO[] = "QT_DEVICE_PIXEL_RATIO";
if (Utils::HostOsInfo().isWindowsHost() if (Utils::HostOsInfo().isWindowsHost()
&& !qEnvironmentVariableIsSet(ENV_VAR_QT_DEVICE_PIXEL_RATIO) // legacy in 5.6, but still functional && !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")) { && !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) {
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
} }
return envVarName;
} }
// taken from utils/fileutils.cpp. We can not use utils here since that depends app_version.h. // 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"); Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + "/QtCreator-XXXXXX");
const char *highDpiEnvironmentVariable = setHighDpiEnvironmentVariable(); setHighDpiEnvironmentVariable();
QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false\nqtc.*.info=false")); QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false\nqtc.*.info=false"));
@@ -322,9 +320,6 @@ int main(int argc, char **argv)
loadFonts(); loadFonts();
if (highDpiEnvironmentVariable)
qunsetenv(highDpiEnvironmentVariable);
if (Utils::HostOsInfo().isWindowsHost() if (Utils::HostOsInfo().isWindowsHost()
&& !qFuzzyCompare(qApp->devicePixelRatio(), 1.0) && !qFuzzyCompare(qApp->devicePixelRatio(), 1.0)
&& QApplication::style()->objectName().startsWith( && QApplication::style()->objectName().startsWith(