diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-09-01 15:56:08 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-09-02 17:17:33 +0200 |
| commit | d0eb261836f8f59898893def84e0250d7502d53a (patch) | |
| tree | 4f217c8737b24fe812ce5d6f8bb2a01b384024b1 /tools | |
| parent | 0056a8d9e10e83157c3974ec1475ac1f96fb9cde (diff) | |
Remove use of deprecated High-DPI application attributes
Change-Id: Ibfb50fdcbb51ba93d6e5d11f9e8ce0e7b3bfde79
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 10 | ||||
| -rw-r--r-- | tools/qmlscene/main.cpp | 6 |
2 files changed, 0 insertions, 16 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 64ed09cf48..4aa270ae9e 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -331,10 +331,6 @@ static void getAppFlags(int argc, char **argv) QCoreApplication::setAttribute(Qt::AA_UseOpenGLES); } else if (!strcmp(argv[i], "-software") || !strcmp(argv[i], "--software")) { QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL); - } else if (!strcmp(argv[i], "-scaling") || !strcmp(argv[i], "--scaling")) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - } else if (!strcmp(argv[i], "-no-scaling") || !strcmp(argv[i], "--no-scaling")) { - QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); } } #else @@ -459,12 +455,6 @@ int main(int argc, char *argv[]) QCommandLineOption glSoftwareOption(QStringLiteral("software"), QCoreApplication::translate("main", "Force use of software rendering (AA_UseSoftwareOpenGL).")); parser.addOption(glSoftwareOption); // Just for the help text... we've already handled this argument above - QCommandLineOption scalingOption(QStringLiteral("scaling"), - QCoreApplication::translate("main", "Enable High DPI scaling (AA_EnableHighDpiScaling).")); - parser.addOption(scalingOption); // Just for the help text... we've already handled this argument above - QCommandLineOption noScalingOption(QStringLiteral("no-scaling"), - QCoreApplication::translate("main", "Disable High DPI scaling (AA_DisableHighDpiScaling).")); - parser.addOption(noScalingOption); // Just for the help text... we've already handled this argument above #endif // QT_GUI_LIB // Debugging and verbosity options QCommandLineOption quietOption(QStringLiteral("quiet"), diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 449e682b4e..c0807ed751 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -360,8 +360,6 @@ static void usage() puts(" --desktop......................... Force use of desktop GL (AA_UseDesktopOpenGL)"); puts(" --gles............................ Force use of GLES (AA_UseOpenGLES)"); puts(" --software........................ Force use of software rendering (AA_UseOpenGLES)"); - puts(" --scaling......................... Enable High DPI scaling (AA_EnableHighDpiScaling)"); - puts(" --no-scaling...................... Disable High DPI scaling (AA_DisableHighDpiScaling)"); puts(" --verbose......................... Print version and graphical diagnostics for the run-time"); #ifdef QT_WIDGETS_LIB puts(" --apptype [gui|widgets] .......... Select which application class to use. Default is widgets."); @@ -444,10 +442,6 @@ int main(int argc, char ** argv) options.applicationAttributes.append(Qt::AA_UseSoftwareOpenGL); } else if (!qstrcmp(arg, "--desktop")) { options.applicationAttributes.append(Qt::AA_UseDesktopOpenGL); - } else if (!qstrcmp(arg, "--scaling")) { - options.applicationAttributes.append(Qt::AA_EnableHighDpiScaling); - } else if (!qstrcmp(arg, "--no-scaling")) { - options.applicationAttributes.append(Qt::AA_DisableHighDpiScaling); } else if (!qstrcmp(arg, "--transparent")) { options.transparent = true; } else if (!qstrcmp(arg, "--multisample")) { |