diff options
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/main.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 240ddde6f1..ff559e7076 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -332,9 +332,8 @@ void printUsage() printf("\t-desktop.......................Force use of desktop GL (AA_UseDesktopOpenGL)\n"); printf("\t-gles..........................Force use of GLES (AA_UseOpenGLES)\n"); printf("\t-software......................Force use of software rendering (AA_UseOpenGLES)\n"); -#if 0 // FIXME: 5.6: Re-enable once attribute naming is final (QTBUG-46615) - printf("\t-no-scaling....................Disable High DPI scaling (AA_NoHighDpiScaling)\n"); -#endif + printf("\t-scaling.......................Enable High DPI scaling (AA_EnableHighDpiScaling)\n"); + printf("\t-no-scaling....................Disable High DPI scaling (AA_DisableHighDpiScaling)\n"); printf("\tDebugging options:\n"); printf("\t-verbose ..................... Print information about what qml is doing, like specific file urls being loaded.\n"); printf("\t-translation [file] .......... Load the given file as the translations file.\n"); @@ -506,10 +505,10 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL); } else if (arg == QLatin1String("-desktop")) { QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL); -#if 0 // FIXME: 5.6: Re-enable once attribute naming is final (QTBUG-46615) + } else if (arg == QLatin1String("-scaling")) { + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); } else if (arg == QLatin1String("-no-scaling")) { - QCoreApplication::setAttribute(Qt::AA_NoHighDpiScaling); -#endif + QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); } else { files << arg; } |