diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-10-29 15:53:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-11-02 17:06:32 +0000 |
| commit | 051684f125bbc31bd882c4cd313c3482bcd145a0 (patch) | |
| tree | 5a517941603d925cf5dc13fad8fedb83faf224fb /tools/qml | |
| parent | 2f2dd3b0c28db210ea1f00d569f6c1626894c5f4 (diff) | |
qmlscene/qml tools: Temporarily disable High DPI options.
To be re-enabled once the attribute names are final.
Task-number: QTBUG-46615
Change-Id: Id463167ab102e3c2f3af4fe39675853eae3bb851
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 0f16c62320..240ddde6f1 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -332,7 +332,9 @@ 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("\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"); @@ -504,8 +506,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("-no-scaling")) { QCoreApplication::setAttribute(Qt::AA_NoHighDpiScaling); +#endif } else { files << arg; } |