Merge branch 'stable' into dev

Conflicts:
	examples/widgets/painting/shared/shared.pri
	src/corelib/tools/qharfbuzz_p.h
	src/corelib/tools/qunicodetools.cpp
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp

Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3

16 files changed, 26 insertions, 27 deletions

diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro
index e94f4d12fb..1f2f8df87f 100644
--- a/examples/widgets/painting/affine/affine.pro
+++ b/examples/widgets/painting/affine/affine.pro
@@ -1,7 +1,7 @@
 SOURCES += main.cpp xform.cpp
 HEADERS += xform.h
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/affine/xform.cpp b/examples/widgets/painting/affine/xform.cpp
index a873ba7af8..d4485df0b3 100644
--- a/examples/widgets/painting/affine/xform.cpp
+++ b/examples/widgets/painting/affine/xform.cpp
@@ -251,12 +251,14 @@ void XFormView::timerEvent(QTimerEvent *e)
     }
 }
 
+#ifndef QT_NO_WHEELEVENT
 void XFormView::wheelEvent(QWheelEvent *e)
 {
     m_scale += e->delta() / qreal(600);
     m_scale = qMax(qreal(0.1), qMin(qreal(4), m_scale));
     emit scaleChanged(int(m_scale*1000));
 }
+#endif
 
 void XFormView::reset()
 {
diff --git a/examples/widgets/painting/affine/xform.h b/examples/widgets/painting/affine/xform.h
index fff92733a0..a04381165d 100644
--- a/examples/widgets/painting/affine/xform.h
+++ b/examples/widgets/painting/affine/xform.h
@@ -116,7 +116,9 @@ signals:
 
 protected:
     void timerEvent(QTimerEvent *e);
+#ifndef QT_NO_WHEELEVENT
     void wheelEvent(QWheelEvent *);
+#endif
 
 private:
     QPolygonF ctrlPoints;
diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.pro b/examples/widgets/painting/basicdrawing/basicdrawing.pro
index 52ee0d4402..a7b3cff9cd 100644
--- a/examples/widgets/painting/basicdrawing/basicdrawing.pro
+++ b/examples/widgets/painting/basicdrawing/basicdrawing.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = renderarea.h \
                 window.h
 SOURCES       = main.cpp \
@@ -8,5 +10,3 @@ RESOURCES     = basicdrawing.qrc
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/basicdrawing
 INSTALLS += target
-
-QT += widgets
diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro
index 7ff82d789a..0269945ac8 100644
--- a/examples/widgets/painting/composition/composition.pro
+++ b/examples/widgets/painting/composition/composition.pro
@@ -6,7 +6,7 @@ SHARED_FOLDER = ../shared
 include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += composition.qrc
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.pro b/examples/widgets/painting/concentriccircles/concentriccircles.pro
index 9690465d46..844c01a9c2 100644
--- a/examples/widgets/painting/concentriccircles/concentriccircles.pro
+++ b/examples/widgets/painting/concentriccircles/concentriccircles.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = circlewidget.h \
                 window.h
 SOURCES       = circlewidget.cpp \
@@ -7,6 +9,3 @@ SOURCES       = circlewidget.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/concentriccircles
 INSTALLS += target
-
-QT += widgets
-
diff --git a/examples/widgets/painting/deform/deform.pro b/examples/widgets/painting/deform/deform.pro
index 01dc0a869c..6409aaed96 100644
--- a/examples/widgets/painting/deform/deform.pro
+++ b/examples/widgets/painting/deform/deform.pro
@@ -7,7 +7,7 @@ include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += deform.qrc
 
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/examples/widgets/painting/fontsampler/fontsampler.pro
index c32fc40572..08dd07bc08 100644
--- a/examples/widgets/painting/fontsampler/fontsampler.pro
+++ b/examples/widgets/painting/fontsampler/fontsampler.pro
@@ -1,3 +1,6 @@
+QT += widgets
+qtHaveModule(printsupport): QT += printsupport
+
 FORMS     = mainwindowbase.ui
 HEADERS   = mainwindow.h
 SOURCES   = main.cpp \
@@ -6,6 +9,3 @@ SOURCES   = main.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/fontsampler
 INSTALLS += target
-
-QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
diff --git a/examples/widgets/painting/gradients/gradients.pro b/examples/widgets/painting/gradients/gradients.pro
index a7d6ae68d1..73f3974c62 100644
--- a/examples/widgets/painting/gradients/gradients.pro
+++ b/examples/widgets/painting/gradients/gradients.pro
@@ -6,7 +6,7 @@ SHARED_FOLDER = ../shared
 include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += gradients.qrc
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/imagecomposition/imagecomposition.pro b/examples/widgets/painting/imagecomposition/imagecomposition.pro
index ce23c601f5..42c70471c1 100644
--- a/examples/widgets/painting/imagecomposition/imagecomposition.pro
+++ b/examples/widgets/painting/imagecomposition/imagecomposition.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = imagecomposer.h
 SOURCES       = imagecomposer.cpp \
                 main.cpp
@@ -6,6 +8,3 @@ RESOURCES     = imagecomposition.qrc
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/imagecomposition
 INSTALLS += target
-
-QT += widgets
-
diff --git a/examples/widgets/painting/painterpaths/painterpaths.pro b/examples/widgets/painting/painterpaths/painterpaths.pro
index 560e84a267..2d2db30739 100644
--- a/examples/widgets/painting/painterpaths/painterpaths.pro
+++ b/examples/widgets/painting/painterpaths/painterpaths.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS       = renderarea.h \
                 window.h
 SOURCES       = main.cpp \
@@ -8,6 +10,3 @@ unix:!mac:!vxworks:!integrity:LIBS += -lm
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/painterpaths
 INSTALLS += target
-
-QT += widgets
-
diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro
index 145fcdd383..7459dd3e94 100644
--- a/examples/widgets/painting/painting.pro
+++ b/examples/widgets/painting/painting.pro
@@ -12,8 +12,6 @@ SUBDIRS       = basicdrawing \
                 transformations \
                 fontsampler
 
-QT += widgets
-
 examples_affine.subdir = affine
 examples_composition.subdir = composition
 examples_deform.subdir = deform
diff --git a/examples/widgets/painting/pathstroke/pathstroke.pro b/examples/widgets/painting/pathstroke/pathstroke.pro
index 197fe22024..8ab3cb9244 100644
--- a/examples/widgets/painting/pathstroke/pathstroke.pro
+++ b/examples/widgets/painting/pathstroke/pathstroke.pro
@@ -7,7 +7,7 @@ include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += pathstroke.qrc
 
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri
index 6aef1bdd5b..af027e081a 100644
--- a/examples/widgets/painting/shared/shared.pri
+++ b/examples/widgets/painting/shared/shared.pri
@@ -1,6 +1,6 @@
 INCLUDEPATH += $$PWD
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2)  {
     DEFINES += QT_OPENGL_SUPPORT
     QT += opengl widgets
 }
diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro
index 2a71c7d487..2756bf75ca 100644
--- a/examples/widgets/painting/shared/shared.pro
+++ b/examples/widgets/painting/shared/shared.pro
@@ -1,17 +1,17 @@
 TEMPLATE = lib
 CONFIG += static
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
-	QT += opengl widgets
+	QT += opengl
 }
+QT += widgets
 
 build_all:!build_pass {
     CONFIG -= build_all
     CONFIG += release
 }
 TARGET = demo_shared
-QT += widgets
 
 SOURCES += \
 	arthurstyle.cpp\
diff --git a/examples/widgets/painting/transformations/transformations.pro b/examples/widgets/painting/transformations/transformations.pro
index 72f42046db..3f5398a228 100644
--- a/examples/widgets/painting/transformations/transformations.pro
+++ b/examples/widgets/painting/transformations/transformations.pro
@@ -1,3 +1,5 @@
+QT += widgets
+
 HEADERS     = renderarea.h \
               window.h
 SOURCES     = main.cpp \
@@ -7,5 +9,3 @@ SOURCES     = main.cpp \
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/transformations
 INSTALLS += target
-
-QT += widgets