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

Conflicts:
	src/corelib/plugin/qlibrary_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp

Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb

examples/embedded/flightinfo/flightinfo.cpp

@@ -239,9 +239,9 @@ public slots:
         int i = data.indexOf("a href=\"?view=detail");
         if (i > 0) {
             QString href = data.mid(i, data.indexOf('\"', i + 8) - i + 1);
-            QRegExp regex("dpap=([A-Za-z0-9]+)");
-            regex.indexIn(href);
-            QString airport = regex.cap(1);
+            QRegularExpression regex("dpap=([A-Za-z0-9]+)");
+            QRegularExpressionMatch match = regex.match(href);
+            QString airport = match.captured(1);
             QUrlQuery query(m_url);
             query.addQueryItem("dpap", airport);
             m_url.setQuery(query);

examples/opengl/legacy/grabber/mainwindow.cpp

@@ -203,10 +203,11 @@ QSize MainWindow::getSize()
     if (!ok)
         return QSize();
 
-    QRegExp regExp(tr("([0-9]+) *x *([0-9]+)"));
-    if (regExp.exactMatch(text)) {
-        int width = regExp.cap(1).toInt();
-        int height = regExp.cap(2).toInt();
+    QRegularExpression regExp(tr("^([0-9]+) *x *([0-9]+)$"));
+    QRegularExpressionMatch match = regExp.match(text);
+    if (match.hasMatch()) {
+        int width = match.captured(1).toInt();
+        int height = match.captured(2).toInt();
         if (width > 0 && width < 2048 && height > 0 && height < 2048)
             return QSize(width, height);
     }

examples/widgets/painting/shared/arthurwidgets.cpp

@@ -59,6 +59,7 @@
 #include <QFile>
 #include <QTextBrowser>
 #include <QBoxLayout>
+#include <QRegularExpression>
 
 extern QPixmap cached(const QString &img);
 
@@ -339,14 +340,12 @@ void ArthurFrame::showSource()
     foreach (QString keyword, ppKeywords)
         contents.replace(keyword, QLatin1String("<font color=navy>") + keyword + QLatin1String("</font>"));
 
-    contents.replace(QRegExp("(\\d\\d?)"), QLatin1String("<font color=navy>\\1</font>"));
+    contents.replace(QRegularExpression("(\\d\\d?)"), QLatin1String("<font color=navy>\\1</font>"));
 
-    QRegExp commentRe("(//.+)\\n");
-    commentRe.setMinimal(true);
+    QRegularExpression commentRe("(//.+?)\\n");
     contents.replace(commentRe, QLatin1String("<font color=red>\\1</font>\n"));
 
-    QRegExp stringLiteralRe("(\".+\")");
-    stringLiteralRe.setMinimal(true);
+    QRegularExpression stringLiteralRe("(\".+?\")");
     contents.replace(stringLiteralRe, QLatin1String("<font color=green>\\1</font>"));
 
     QString html = contents;

examples/widgets/tools/codecs/mainwindow.cpp

@@ -138,7 +138,8 @@ void MainWindow::aboutToShowSaveAsMenu()
 void MainWindow::findCodecs()
 {
     QMap<QString, QTextCodec *> codecMap;
-    QRegExp iso8859RegExp("ISO[- ]8859-([0-9]+).*");
+    QRegularExpression iso8859RegExp("^ISO[- ]8859-([0-9]+).*$");
+    QRegularExpressionMatch match;
 
     foreach (int mib, QTextCodec::availableMibs()) {
         QTextCodec *codec = QTextCodec::codecForMib(mib);
@@ -150,8 +151,8 @@ void MainWindow::findCodecs()
             rank = 1;
         } else if (sortKey.startsWith(QLatin1String("UTF-16"))) {
             rank = 2;
-        } else if (iso8859RegExp.exactMatch(sortKey)) {
-            if (iso8859RegExp.cap(1).size() == 1)
+        } else if ((match = iso8859RegExp.match(sortKey)).hasMatch()) {
+            if (match.captured(1).size() == 1)
                 rank = 3;
             else
                 rank = 4;

examples/widgets/tools/settingseditor/variantdelegate.cpp

@@ -56,14 +56,14 @@ VariantDelegate::VariantDelegate(QObject *parent)
     : QItemDelegate(parent)
 {
     boolExp.setPattern("true|false");
-    boolExp.setCaseSensitivity(Qt::CaseInsensitive);
+    boolExp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
 
     byteArrayExp.setPattern("[\\x00-\\xff]*");
     charExp.setPattern(".");
-    colorExp.setPattern("\\(([0-9]*),([0-9]*),([0-9]*),([0-9]*)\\)");
+    colorExp.setPattern("^\\(([0-9]*),([0-9]*),([0-9]*),([0-9]*)\\)$");
     doubleExp.setPattern("");
-    pointExp.setPattern("\\((-?[0-9]*),(-?[0-9]*)\\)");
-    rectExp.setPattern("\\((-?[0-9]*),(-?[0-9]*),(-?[0-9]*),(-?[0-9]*)\\)");
+    pointExp.setPattern("^\\((-?[0-9]*),(-?[0-9]*)\\)$");
+    rectExp.setPattern("^\\((-?[0-9]*),(-?[0-9]*),(-?[0-9]*),(-?[0-9]*)\\)$");
     signedIntegerExp.setPattern("-?[0-9]*");
     sizeExp = pointExp;
     unsignedIntegerExp.setPattern("[0-9]*");
@@ -104,7 +104,7 @@ QWidget *VariantDelegate::createEditor(QWidget *parent,
     QLineEdit *lineEdit = new QLineEdit(parent);
     lineEdit->setFrame(false);
 
-    QRegExp regExp;
+    QRegularExpression regExp;
 
     switch (originalValue.type()) {
     case QVariant::Bool:
@@ -152,8 +152,8 @@ QWidget *VariantDelegate::createEditor(QWidget *parent,
         ;
     }
 
-    if (!regExp.isEmpty()) {
-        QValidator *validator = new QRegExpValidator(regExp, lineEdit);
+    if (regExp.isValid()) {
+        QValidator *validator = new QRegularExpressionValidator(regExp, lineEdit);
         lineEdit->setValidator(validator);
     }
 
@@ -185,17 +185,18 @@ void VariantDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
 
     QVariant originalValue = index.model()->data(index, Qt::UserRole);
     QVariant value;
+    QRegularExpressionMatch match;
 
     switch (originalValue.type()) {
     case QVariant::Char:
         value = text.at(0);
         break;
     case QVariant::Color:
-        colorExp.exactMatch(text);
-        value = QColor(qMin(colorExp.cap(1).toInt(), 255),
-                       qMin(colorExp.cap(2).toInt(), 255),
-                       qMin(colorExp.cap(3).toInt(), 255),
-                       qMin(colorExp.cap(4).toInt(), 255));
+        match = colorExp.match(text);
+        value = QColor(qMin(match.captured(1).toInt(), 255),
+                       qMin(match.captured(2).toInt(), 255),
+                       qMin(match.captured(3).toInt(), 255),
+                       qMin(match.captured(4).toInt(), 255));
         break;
     case QVariant::Date:
         {
@@ -214,17 +215,17 @@ void VariantDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
         }
         break;
     case QVariant::Point:
-        pointExp.exactMatch(text);
-        value = QPoint(pointExp.cap(1).toInt(), pointExp.cap(2).toInt());
+        match = pointExp.match(text);
+        value = QPoint(match.captured(1).toInt(), match.captured(2).toInt());
         break;
     case QVariant::Rect:
-        rectExp.exactMatch(text);
-        value = QRect(rectExp.cap(1).toInt(), rectExp.cap(2).toInt(),
-                      rectExp.cap(3).toInt(), rectExp.cap(4).toInt());
+        match = rectExp.match(text);
+        value = QRect(match.captured(1).toInt(), match.captured(2).toInt(),
+                      match.captured(3).toInt(), match.captured(4).toInt());
         break;
     case QVariant::Size:
-        sizeExp.exactMatch(text);
-        value = QSize(sizeExp.cap(1).toInt(), sizeExp.cap(2).toInt());
+        match = sizeExp.match(text);
+        value = QSize(match.captured(1).toInt(), match.captured(2).toInt());
         break;
     case QVariant::StringList:
         value = text.split(',');

examples/widgets/tools/settingseditor/variantdelegate.h

@@ -52,7 +52,7 @@
 #define VARIANTDELEGATE_H
 
 #include <QItemDelegate>
-#include <QRegExp>
+#include <QRegularExpression>
 
 class VariantDelegate : public QItemDelegate
 {
@@ -73,19 +73,19 @@ class VariantDelegate : public QItemDelegate
     static QString displayText(const QVariant &value);
 
 private:
-    mutable QRegExp boolExp;
-    mutable QRegExp byteArrayExp;
-    mutable QRegExp charExp;
-    mutable QRegExp colorExp;
-    mutable QRegExp dateExp;
-    mutable QRegExp dateTimeExp;
-    mutable QRegExp doubleExp;
-    mutable QRegExp pointExp;
-    mutable QRegExp rectExp;
-    mutable QRegExp signedIntegerExp;
-    mutable QRegExp sizeExp;
-    mutable QRegExp timeExp;
-    mutable QRegExp unsignedIntegerExp;
+    mutable QRegularExpression boolExp;
+    mutable QRegularExpression byteArrayExp;
+    mutable QRegularExpression charExp;
+    mutable QRegularExpression colorExp;
+    mutable QRegularExpression dateExp;
+    mutable QRegularExpression dateTimeExp;
+    mutable QRegularExpression doubleExp;
+    mutable QRegularExpression pointExp;
+    mutable QRegularExpression rectExp;
+    mutable QRegularExpression signedIntegerExp;
+    mutable QRegularExpression sizeExp;
+    mutable QRegularExpression timeExp;
+    mutable QRegularExpression unsignedIntegerExp;
 };
 
 #endif

examples/widgets/widgets/stylesheet/stylesheeteditor.cpp

@@ -57,11 +57,12 @@ StyleSheetEditor::StyleSheetEditor(QWidget *parent)
 {
     ui.setupUi(this);
 
-    QRegExp regExp(".(.*)\\+?Style");
+    QRegularExpression regExp("^.(.*)\\+?Style$");
     QString defaultStyle = QApplication::style()->metaObject()->className();
+    QRegularExpressionMatch match = regExp.match(defaultStyle);
 
-    if (regExp.exactMatch(defaultStyle))
-        defaultStyle = regExp.cap(1);
+    if (match.hasMatch())
+        defaultStyle = match.captured(1);
 
     ui.styleCombo->addItems(QStyleFactory::keys());
     ui.styleCombo->setCurrentIndex(ui.styleCombo->findText(defaultStyle, Qt::MatchContains));

qmake/doc/src/qmake-manual.qdoc

@@ -1230,10 +1230,6 @@
     This variable is also used to specify which additional files will be
     deployed to embedded devices.
 
-    For Windows CE, the default deployment target path is
-    \c{%CSIDL_PROGRAM_FILES%\target}, which usually gets expanded to
-    \c{\Program Files\target}.
-
     \target LEXIMPLS
     \section1 LEXIMPLS
 
@@ -2354,16 +2350,6 @@
     qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
     needs to be modified.
 
-    \target SIGNATURE_FILE
-    \section1 SIGNATURE_FILE
-
-    \note This variable is only used on Windows CE.
-
-    Specifies which signature file should be used to sign the project target.
-
-    \note This variable will overwrite the setting you have specified in configure,
-    with the \c -signature option.
-
     \target SOURCES
     \section1 SOURCES
 
@@ -4483,8 +4469,8 @@
     include the precompiled header file in \c HEADERS, as
     qmake will do this if the configuration supports precompiled headers.
 
-    The MSVC and g++ specs targeting Windows (and Windows CE) enable
-    \c precompile_header by default.
+    The MSVC and g++ specs targeting Windows enable \c precompile_header
+    by default.
 
     Using this option, you may trigger
     conditional blocks in your project file to add settings when using

src/android/jar/src/org/qtproject/qt5/android/QtNative.java

@@ -243,13 +243,24 @@ private static void runAction(Runnable action)
         }
     }
 
-    private static void runPendingCppRunnablesOnUiThread()
+    private static void runPendingCppRunnablesOnAndroidThread()
     {
         synchronized (m_mainActivityMutex) {
-            if (!m_activityPaused && m_activity != null)
-                m_activity.runOnUiThread(runPendingCppRunnablesRunnable);
-            else
-                runAction(runPendingCppRunnablesRunnable);
+            if (m_activity != null) {
+                if (!m_activityPaused)
+                    m_activity.runOnUiThread(runPendingCppRunnablesRunnable);
+                else
+                    runAction(runPendingCppRunnablesRunnable);
+            } else {
+                final Looper mainLooper = Looper.getMainLooper();
+                final Thread looperThread = mainLooper.getThread();
+                if (looperThread.equals(Thread.currentThread())) {
+                    runPendingCppRunnablesRunnable.run();
+                } else {
+                    final Handler handler = new Handler(mainLooper);
+                    handler.post(runPendingCppRunnablesRunnable);
+                }
+            }
         }
     }
 

src/corelib/configure.json

@@ -211,8 +211,7 @@
         },
         "dlopen": {
             "label": "dlopen()",
-            "condition": "tests.dlopen || libs.libdl",
-            "output": [ { "type": "define", "negative": true, "name": "QT_NO_DYNAMIC_LIBRARY" } ]
+            "condition": "tests.dlopen || libs.libdl"
         },
         "libdl": {
             "label": "dlopen() in libdl",
@@ -463,6 +462,7 @@
             "label": "QLibrary",
             "purpose": "Provides a wrapper for dynamically loaded libraries.",
             "section": "File I/O",
+            "condition": "config.win32 || config.hpux || (!config.nacl && features.dlopen)",
             "output": [ "publicFeature", "feature" ]
         },
         "settings": {

src/corelib/doc/snippets/events/events.cpp

@@ -87,15 +87,15 @@ class MyCustomEvent : public QEvent
 bool MyWidget::event(QEvent *event)
 {
     if (event->type() == QEvent::KeyPress) {
-    QKeyEvent *ke = static_cast<QKeyEvent *>(event);
-    if (ke->key() == Qt::Key_Tab) {
-        // special tab handling here
-        return true;
-    }
+        QKeyEvent *ke = static_cast<QKeyEvent *>(event);
+        if (ke->key() == Qt::Key_Tab) {
+            // special tab handling here
+            return true;
+        }
     } else if (event->type() == MyCustomEventType) {
-    MyCustomEvent *myEvent = static_cast<MyCustomEvent *>(event);
-    // custom event handling here
-    return true;
+        MyCustomEvent *myEvent = static_cast<MyCustomEvent *>(event);
+        // custom event handling here
+        return true;
     }
 
     return QWidget::event(event);

src/corelib/global/qnamespace.qdoc

@@ -2105,7 +2105,7 @@
                    On \macos, tool windows correspond to the
                    \l{http://developer.apple.com/documentation/Carbon/Conceptual/HandlingWindowsControls/hitb-wind_cont_concept/chapter_2_section_2.html}{Floating}
                    class of windows. This means that the window lives on a
-                   level above normal windows; it impossible to put a normal
+                   level above normal windows making it impossible to put a normal
                    window on top of it. By default, tool windows will disappear
                    when the application is inactive.  This can be controlled by
                    the Qt::WA_MacAlwaysShowToolWindow attribute.