Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/quick/accessible/qaccessiblequickview_p.h
	src/quick/items/qquickmousearea.cpp
	src/quick/util/qquickanimatorjob.cpp
	tools/qmlplugindump/main.cpp

Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809

1 files changed, 5 insertions, 1 deletions

diff --git a/tools/tools.pro b/tools/tools.pro
index 1a90b8e776..bf39a649df 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -16,8 +16,12 @@ SUBDIRS += \
         !static: {
             SUBDIRS += \
                 qmlscene \
-                qmlplugindump \
                 qmltime
+
+            qtConfig(regularexpression) {
+                SUBDIRS += \
+                    qmlplugindump
+            }
         }
         qtHaveModule(widgets): SUBDIRS += qmleasing
     }