Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	tools/qmlprofiler/qmlprofilerclient.cpp

Change-Id: I1de8832fefd0e45fea16ca072b6c7ae44fa376d4

3 files changed, 12 insertions, 4 deletions

diff --git a/tools/fdegen/main.cpp b/tools/fdegen/main.cpp
index 1fb7a5b076..1906037989 100644
--- a/tools/fdegen/main.cpp
+++ b/tools/fdegen/main.cpp
@@ -140,7 +140,7 @@ static int createSectionCallback(
 }
 
 static unsigned char cie_init_instructions[] = {
-    DW_CFA_def_cfa, StackPointerRegister, /*offset in bytes */QT_POINTER_SIZE,
+    DW_CFA_def_cfa, StackPointerRegister, /*offset in bytes */sizeof(void*),
     DW_CFA_offset | InstructionPointerRegister, 1,
 };
 
@@ -158,8 +158,8 @@ int main()
 
     Dwarf_Unsigned cie = dwarf_add_frame_cie(dw,
                                              "",
-                                             /* code alignment factor */QT_POINTER_SIZE,
-                                             /* data alignment factor */-QT_POINTER_SIZE,
+                                             /* code alignment factor */sizeof(void*),
+                                             /* data alignment factor */-sizeof(void*),
                                              /* return address reg*/InstructionPointerRegister,
                                              cie_init_instructions,
                                              sizeof(cie_init_instructions),
@@ -270,7 +270,7 @@ int main()
 
     printf("static const int fde_offset = %d;\n", fde_offset);
     printf("static const int initial_location_offset = %d;\n", fde_offset + 8);
-    printf("static const int address_range_offset = %d;\n", fde_offset + 8 + QT_POINTER_SIZE);
+    printf("static const int address_range_offset = %d;\n", fde_offset + 8 + sizeof(void*));
 
 #ifdef DEBUG
     {
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;
         }
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 9bf1c200e4..53bd0bfbad 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -356,7 +356,9 @@ 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)");
+#if 0 // FIXME: 5.6: Re-enable once attribute naming is final (QTBUG-46615)
     puts("  --no-scaling.......................Disable High DPI scaling (AA_NoHighDpiScaling)");
+#endif
     puts("  --verbose..........................Print version and graphical diagnostics for the run-time");
     puts("  -I <path> ........................ Add <path> to the list of import paths");
     puts("  -P <path> ........................ Add <path> to the list of plugin paths");
@@ -451,8 +453,10 @@ int main(int argc, char ** argv)
             options.applicationAttributes.append(Qt::AA_UseSoftwareOpenGL);
         else if (!qstrcmp(arg, "--desktop"))
             options.applicationAttributes.append(Qt::AA_UseDesktopOpenGL);
+#if 0 // FIXME: 5.6: Re-enable once attribute naming is final (QTBUG-46615)
         else if (!qstrcmp(arg, "--no-scaling"))
             options.applicationAttributes.append(Qt::AA_NoHighDpiScaling);
+#endif
     }
 
     foreach (Qt::ApplicationAttribute a, options.applicationAttributes)