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

This change partially reverts 1bfc7f68 about QT_HAS_BUILTIN define
and undef in src/corelib/tools/qsimd_p.h.

This change is also squashed with "Fall back to c++11 standard
compiler flag for host builds" which is done by Peter Seiderer.

Conflicts:
	mkspecs/features/default_post.prf
	src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch
	src/3rdparty/sqlite/sqlite3.c
	src/corelib/tools/qsimd_p.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface_p.h
	src/plugins/bearer/blackberry/blackberry.pro
	src/plugins/platforms/cocoa/qcocoasystemsettings.mm
	src/plugins/platformthemes/gtk2/gtk2.pro
	src/plugins/styles/bb10style/bb10style.pro
	src/sql/drivers/sqlite2/qsql_sqlite2.cpp
	tools/configure/configureapp.cpp

Task-number: QTBUG-51644
Done-with: Peter Seiderer <ps.report@gmx.net>
Change-Id: I6100d6ace31b2e8d41a95f0b5d5ebf8f1fd88b44

1 files changed, 56 insertions, 50 deletions

diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index edfc0e7954..163842e8fc 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -7,8 +7,12 @@ CONFIG += \
 
 load(qt_helper_lib)
 
+# built-in shapers list configuration:
+SHAPERS += opentype       # HB's main shaper; enabling it should be enough most of the time
+mac: SHAPERS += coretext  # native shaper on OSX/iOS; could be used alone to handle both OT and AAT fonts
+
 DEFINES += HAVE_CONFIG_H
-DEFINES += HAVE_OT HB_NO_UNICODE_FUNCS HB_DISABLE_DEPRECATED
+DEFINES += HB_NO_UNICODE_FUNCS HB_DISABLE_DEPRECATED
 
 # platform/compiler specific definitions
 DEFINES += HAVE_ATEXIT
@@ -78,57 +82,59 @@ HEADERS += \
     $$PWD/src/hb-unicode.h \
     $$PWD/src/hb-version.h
 
-# Open Type
-SOURCES += \
-    $$PWD/src/hb-ot-font.cc \
-    $$PWD/src/hb-ot-layout.cc \
-    $$PWD/src/hb-ot-map.cc \
-    $$PWD/src/hb-ot-shape.cc \
-    $$PWD/src/hb-ot-shape-complex-arabic.cc \
-    $$PWD/src/hb-ot-shape-complex-default.cc \
-    $$PWD/src/hb-ot-shape-complex-hangul.cc \
-    $$PWD/src/hb-ot-shape-complex-hebrew.cc \
-    $$PWD/src/hb-ot-shape-complex-indic.cc \
-    $$PWD/src/hb-ot-shape-complex-indic-table.cc \
-    $$PWD/src/hb-ot-shape-complex-myanmar.cc \
-    $$PWD/src/hb-ot-shape-complex-thai.cc \
-    $$PWD/src/hb-ot-shape-complex-tibetan.cc \
-    $$PWD/src/hb-ot-shape-complex-use.cc \
-    $$PWD/src/hb-ot-shape-complex-use-table.cc \
-    $$PWD/src/hb-ot-shape-fallback.cc \
-    $$PWD/src/hb-ot-shape-normalize.cc
+contains(SHAPERS, opentype) {
+    DEFINES += HAVE_OT
 
-HEADERS += \
-    $$PWD/src/hb-ot-layout-common-private.hh \
-    $$PWD/src/hb-ot-layout-gdef-table.hh \
-    $$PWD/src/hb-ot-layout-gpos-table.hh \
-    $$PWD/src/hb-ot-layout-gsubgpos-private.hh \
-    $$PWD/src/hb-ot-layout-gsub-table.hh \
-    $$PWD/src/hb-ot-layout-jstf-table.hh \
-    $$PWD/src/hb-ot-layout-private.hh \
-    $$PWD/src/hb-ot-map-private.hh \
-    $$PWD/src/hb-ot-shape-complex-arabic-fallback.hh \
-    $$PWD/src/hb-ot-shape-complex-arabic-private.hh \
-    $$PWD/src/hb-ot-shape-complex-arabic-table.hh \
-    $$PWD/src/hb-ot-shape-complex-indic-machine.hh \
-    $$PWD/src/hb-ot-shape-complex-indic-private.hh \
-    $$PWD/src/hb-ot-shape-complex-myanmar-machine.hh \
-    $$PWD/src/hb-ot-shape-complex-private.hh \
-    $$PWD/src/hb-ot-shape-complex-use-machine.hh \
-    $$PWD/src/hb-ot-shape-complex-use-private.hh \
-    $$PWD/src/hb-ot-shape-fallback-private.hh \
-    $$PWD/src/hb-ot-shape-normalize-private.hh \
-    $$PWD/src/hb-ot-shape-private.hh
+    SOURCES += \
+        $$PWD/src/hb-ot-font.cc \
+        $$PWD/src/hb-ot-layout.cc \
+        $$PWD/src/hb-ot-map.cc \
+        $$PWD/src/hb-ot-shape.cc \
+        $$PWD/src/hb-ot-shape-complex-arabic.cc \
+        $$PWD/src/hb-ot-shape-complex-default.cc \
+        $$PWD/src/hb-ot-shape-complex-hangul.cc \
+        $$PWD/src/hb-ot-shape-complex-hebrew.cc \
+        $$PWD/src/hb-ot-shape-complex-indic.cc \
+        $$PWD/src/hb-ot-shape-complex-indic-table.cc \
+        $$PWD/src/hb-ot-shape-complex-myanmar.cc \
+        $$PWD/src/hb-ot-shape-complex-thai.cc \
+        $$PWD/src/hb-ot-shape-complex-tibetan.cc \
+        $$PWD/src/hb-ot-shape-complex-use.cc \
+        $$PWD/src/hb-ot-shape-complex-use-table.cc \
+        $$PWD/src/hb-ot-shape-fallback.cc \
+        $$PWD/src/hb-ot-shape-normalize.cc
 
-HEADERS += \
-    $$PWD/src/hb-ot.h \
-    $$PWD/src/hb-ot-font.h \
-    $$PWD/src/hb-ot-layout.h \
-    $$PWD/src/hb-ot-shape.h \
-    $$PWD/src/hb-ot-tag.h
-
-mac {
-    # Apple Advanced Typography
+    HEADERS += \
+        $$PWD/src/hb-ot-layout-common-private.hh \
+        $$PWD/src/hb-ot-layout-gdef-table.hh \
+        $$PWD/src/hb-ot-layout-gpos-table.hh \
+        $$PWD/src/hb-ot-layout-gsubgpos-private.hh \
+        $$PWD/src/hb-ot-layout-gsub-table.hh \
+        $$PWD/src/hb-ot-layout-jstf-table.hh \
+        $$PWD/src/hb-ot-layout-private.hh \
+        $$PWD/src/hb-ot-map-private.hh \
+        $$PWD/src/hb-ot-shape-complex-arabic-fallback.hh \
+        $$PWD/src/hb-ot-shape-complex-arabic-private.hh \
+        $$PWD/src/hb-ot-shape-complex-arabic-table.hh \
+        $$PWD/src/hb-ot-shape-complex-indic-machine.hh \
+        $$PWD/src/hb-ot-shape-complex-indic-private.hh \
+        $$PWD/src/hb-ot-shape-complex-myanmar-machine.hh \
+        $$PWD/src/hb-ot-shape-complex-private.hh \
+        $$PWD/src/hb-ot-shape-complex-use-machine.hh \
+        $$PWD/src/hb-ot-shape-complex-use-private.hh \
+        $$PWD/src/hb-ot-shape-fallback-private.hh \
+        $$PWD/src/hb-ot-shape-normalize-private.hh \
+        $$PWD/src/hb-ot-shape-private.hh
+
+    HEADERS += \
+        $$PWD/src/hb-ot.h \
+        $$PWD/src/hb-ot-font.h \
+        $$PWD/src/hb-ot-layout.h \
+        $$PWD/src/hb-ot-shape.h \
+        $$PWD/src/hb-ot-tag.h
+}
+
+contains(SHAPERS, coretext) {
     DEFINES += HAVE_CORETEXT
 
     SOURCES += \