Merge "Merge remote-tracking branch 'origin/4.2' into 4.3" into 4.3

doc/fixnavi.pl

@@ -133,7 +133,8 @@ my %next = ();
 my $last = $doctitle;
 my $lastpage = $title2page{$last};
 for my $title (@toc) {
-    my $page = $title2page{$title};
+    my $type = $title2type{$title};
+    my $page = ($type eq "page") ? $title2page{$title} : "{$title}\n";
     defined($page) or die "TOC refers to unknown page/example '$title'.\n";
     $next{$last} = $page;
     $prev{$title} = $lastpage;

src/libs/qmljs/qmljscheck.cpp

@@ -33,6 +33,7 @@
 
 #include <QColor>
 #include <QDir>
+#include <QRegExp>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;

src/libs/qmljs/qmljsdocument.cpp

@@ -35,6 +35,7 @@
 #include <QCryptographicHash>
 #include <QDir>
 #include <QFileInfo>
+#include <QRegExp>
 
 #include <algorithm>
 

src/libs/qmljs/qmljsfindexportedcpptypes.cpp

@@ -34,6 +34,7 @@
 #include <utils/qtcassert.h>
 
 #include <QList>
+#include <QRegExp>
 
 //using namespace QmlJS;
 

src/libs/qmljs/qmljsscopechain.cpp

@@ -29,6 +29,8 @@
 #include "qmljsmodelmanagerinterface.h"
 #include "parser/qmljsengine_p.h"
 
+#include <QRegExp>
+
 using namespace QmlJS;
 
 /*!

src/libs/utils/buildablehelperlibrary.cpp

@@ -30,6 +30,7 @@
 #include <QDir>
 #include <QDateTime>
 #include <QDebug>
+#include <QRegExp>
 
 namespace Utils {
 

src/libs/utils/fileutils.cpp

@@ -36,6 +36,7 @@
 #include <QDragEnterEvent>
 #include <QDropEvent>
 #include <QMessageBox>
+#include <QRegExp>
 #include <QTimer>
 #include <QUrl>
 

src/libs/utils/qtcprocess.cpp

@@ -32,6 +32,7 @@
 #include <QDir>
 #include <QDebug>
 #include <QCoreApplication>
+#include <QRegExp>
 #include <QStack>
 
 #ifdef Q_OS_WIN

src/libs/utils/templateengine.cpp

@@ -28,6 +28,7 @@
 #include "qtcassert.h"
 
 #include <QJSEngine>
+#include <QRegExp>
 #include <QStack>
 
 namespace Utils {

src/plugins/android/androidmanager.cpp

@@ -56,6 +56,7 @@
 #include <QFileSystemWatcher>
 #include <QList>
 #include <QProcess>
+#include <QRegExp>
 #include <QMessageBox>
 #include <QApplication>
 #include <QDomDocument>

src/plugins/android/androidrunner.cpp

@@ -47,6 +47,7 @@
 #include <memory>
 #include <QApplication>
 #include <QDir>
+#include <QRegExp>
 #include <QTime>
 #include <QTcpServer>
 #include <QTcpSocket>

src/plugins/android/androidtoolchain.cpp

@@ -45,6 +45,7 @@
 #include <QDirIterator>
 #include <QFormLayout>
 #include <QLabel>
+#include <QRegExp>
 #include <QVBoxLayout>
 
 namespace {

src/plugins/android/javaparser.h

@@ -28,6 +28,8 @@
 #include <projectexplorer/ioutputparser.h>
 #include <utils/fileutils.h>
 
+#include <QRegExp>
+
 namespace Android {
 namespace Internal {
 

src/plugins/autotest/gtest/gtestoutputreader.cpp

@@ -28,6 +28,7 @@
 
 #include <QDir>
 #include <QFileInfo>
+#include <QRegExp>
 
 namespace Autotest {
 namespace Internal {

src/plugins/bazaar/bazaarclient.cpp

@@ -36,6 +36,7 @@
 
 #include <QDir>
 #include <QFileInfo>
+#include <QRegExp>
 #include <QTextStream>
 #include <QDebug>
 

src/plugins/clearcase/clearcasesync.cpp

@@ -29,6 +29,7 @@
 #include <QDir>
 #include <QFutureInterface>
 #include <QProcess>
+#include <QRegExp>
 #include <QStringList>
 #include <utils/qtcassert.h>
 

src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp

@@ -25,6 +25,7 @@
 
 #include "cmakeautocompleter.h"
 
+#include <QRegExp>
 #include <QTextCursor>
 #include <QTextBlock>
 #include <QDebug>

src/plugins/cmakeprojectmanager/cmakebuildstep.h

@@ -27,6 +27,8 @@
 
 #include <projectexplorer/abstractprocessstep.h>
 
+#include <QRegExp>
+
 QT_BEGIN_NAMESPACE
 class QLineEdit;
 class QListWidget;

src/plugins/cmakeprojectmanager/cmakeparser.h

@@ -30,6 +30,7 @@
 #include <projectexplorer/ioutputparser.h>
 #include <projectexplorer/task.h>
 
+#include <QRegExp>
 #include <QRegularExpression>
 
 namespace CMakeProjectManager {

src/plugins/coreplugin/actionmanager/command.cpp

@@ -32,6 +32,7 @@
 #include <utils/hostosinfo.h>
 
 #include <QAction>
+#include <QRegExp>
 #include <QToolButton>
 #include <QTextStream>
 

src/plugins/coreplugin/find/basetextfind.cpp

@@ -29,10 +29,9 @@
 #include <utils/filesearch.h>
 
 #include <QPointer>
-
-#include <QTextBlock>
 #include <QPlainTextEdit>
 #include <QRegularExpression>
+#include <QTextBlock>
 #include <QTextCursor>
 
 namespace Core {

src/plugins/coreplugin/locator/basefilefilter.cpp

@@ -30,6 +30,7 @@
 #include <utils/qtcassert.h>
 
 #include <QDir>
+#include <QRegExp>
 #include <QStringMatcher>
 #include <QTimer>
 

src/plugins/coreplugin/locator/opendocumentsfilter.cpp

@@ -32,6 +32,7 @@
 #include <QAbstractItemModel>
 #include <QFileInfo>
 #include <QMutexLocker>
+#include <QRegExp>
 
 using namespace Core;
 using namespace Core;

src/plugins/coreplugin/toolsettings.cpp

@@ -35,6 +35,7 @@
 #include <QCoreApplication>
 #include <QFileInfo>
 #include <QDir>
+#include <QRegExp>
 
 #include <QDebug>
 

src/plugins/cppeditor/cppfunctiondecldeflink.cpp

@@ -46,6 +46,7 @@
 #include <utils/runextensions.h>
 #include <utils/tooltip/tooltip.h>
 
+#include <QRegExp>
 #include <QVarLengthArray>
 
 using namespace CPlusPlus;

src/plugins/cpptools/cppcurrentdocumentfilter.cpp

@@ -31,6 +31,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
+#include <QRegExp>
 #include <QStringMatcher>
 
 using namespace CppTools::Internal;

src/plugins/cpptools/cpplocatorfilter.cpp

@@ -28,6 +28,7 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 
+#include <QRegExp>
 #include <QStringMatcher>
 
 #include <algorithm>

src/plugins/diffeditor/differ.cpp

@@ -34,6 +34,7 @@ publication by Neil Fraser: http://neil.fraser.name/writing/diff/
 #include "differ.h"
 
 #include <QList>
+#include <QRegExp>
 #include <QStringList>
 #include <QMap>
 #include <QPair>

src/plugins/diffeditor/diffutils.cpp

@@ -25,6 +25,7 @@
 
 #include "diffutils.h"
 #include "differ.h"
+#include <QRegExp>
 #include <QStringList>
 #include <QTextStream>
 #include "texteditor/fontsettings.h"

src/plugins/git/githighlighters.h

@@ -27,6 +27,8 @@
 
 #include <texteditor/syntaxhighlighter.h>
 
+#include <QRegExp>
+
 namespace Git {
 namespace Internal {
 

src/plugins/help/searchwidget.cpp

@@ -45,6 +45,7 @@
 #include <QLayout>
 #include <QMap>
 #include <QMenu>
+#include <QRegExp>
 #include <QString>
 #include <QStringList>
 #include <QTextBrowser>

src/plugins/projectexplorer/abi.cpp

@@ -30,6 +30,7 @@
 #include <QDebug>
 #include <QtEndian>
 #include <QFile>
+#include <QRegExp>
 #include <QString>
 #include <QStringList>
 #include <QSysInfo>

src/plugins/projectexplorer/gcctoolchain.cpp

@@ -455,6 +455,7 @@ ToolChain::PredefinedMacrosRunner GccToolChain::createPredefinedMacrosRunner() c
             } else if (a == "-m128bit-long-double" || a == "-m32" || a == "-m3dnow" || a == "-m3dnowa"
                        || a == "-m64" || a == "-m96bit-long-double" || a == "-mabm" || a == "-maes"
                        || a.startsWith("-march=") || a == "-mavx" || a.startsWith("-masm=")
+                       || a.startsWith("-mfloat-abi")
                        || a == "-mcx16" || a == "-mfma" || a == "-mfma4" || a == "-mlwp"
                        || a == "-mpclmul" || a == "-mpopcnt" || a == "-msse" || a == "-msse2"
                        || a == "-msse2avx" || a == "-msse3" || a == "-msse4" || a == "-msse4.1"

src/plugins/projectexplorer/settingsaccessor.cpp

@@ -43,6 +43,7 @@
 
 #include <QApplication>
 #include <QDir>
+#include <QRegExp>
 
 using namespace Utils;
 

src/plugins/pythoneditor/pythoneditorplugin.cpp

@@ -59,6 +59,7 @@
 #include <QtPlugin>
 #include <QCoreApplication>
 #include <QFormLayout>
+#include <QRegExp>
 
 using namespace Core;
 using namespace ProjectExplorer;

src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp

@@ -33,6 +33,7 @@
 
 #include <QFileInfo>
 #include <QDir>
+#include <QRegExp>
 #include <QSet>
 
 static QString headerGuard(const QString &header)

src/plugins/qmakeprojectmanager/makefileparse.cpp

@@ -32,6 +32,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
+#include <QRegExp>
 #include <QTextStream>
 #include <QLoggingCategory>
 

src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp

@@ -29,6 +29,7 @@
 #include <rewritingexception.h>
 
 #include <QDebug>
+#include <QRegExp>
 #include <math.h>
 
 #include <nodemetainfo.h>

src/plugins/qmldesigner/designercore/model/abstractview.cpp

@@ -34,6 +34,8 @@
 #include <coreplugin/helpmanager.h>
 #include <utils/qtcassert.h>
 
+#include <QRegExp>
+
 namespace QmlDesigner {
 
 

src/plugins/qmldesigner/designercore/model/modelnode.cpp

@@ -43,6 +43,7 @@
 #include <rewriterview.h>
 
 #include <QHash>
+#include <QRegExp>
 #include <QSet>
 #include <QTextStream>
 

src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp

@@ -39,6 +39,8 @@
 #include <qmldesignerplugin.h>
 #endif
 
+#include <QRegExp>
+
 namespace QmlDesigner {
 
 void QmlObjectNode::setVariantProperty(const PropertyName &name, const QVariant &value)

src/plugins/qmljstools/qmljsfunctionfilter.cpp

@@ -29,6 +29,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/algorithm.h>
 
+#include <QRegExp>
 #include <QStringMatcher>
 
 using namespace QmlJSTools::Internal;

src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp

@@ -37,6 +37,7 @@
 #include <QDebug>
 #include <QFile>
 #include <QMessageBox>
+#include <QRegExp>
 #include <QStack>
 
 #include <functional>

src/plugins/qmlprofiler/qmlprofilertraceview.cpp

@@ -67,6 +67,7 @@
 #include <QQuickItem>
 #include <QQuickWidget>
 #include <QApplication>
+#include <QRegExp>
 #include <QTextCursor>
 
 #include <math.h>

src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp

@@ -32,6 +32,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QImageReader>
+#include <QRegExp>
 
 namespace QmlProjectManager {
 

src/plugins/qmlprojectmanager/fileformat/filefilteritems.h

@@ -28,6 +28,7 @@
 #include "qmlprojectitem.h"
 
 #include <QObject>
+#include <QRegExp>
 #include <QSet>
 #include <QTimer>
 

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -48,6 +48,7 @@
 #include <utils/algorithm.h>
 
 #include <QDebug>
+#include <QRegExp>
 
 using namespace Core;
 using namespace ProjectExplorer;

src/plugins/qnx/qnxversionnumber.cpp

@@ -26,6 +26,7 @@
 #include "qnxversionnumber.h"
 
 #include <QDir>
+#include <QRegExp>
 
 namespace Qnx {
 namespace Internal {

src/plugins/qnx/slog2inforunner.cpp

@@ -30,6 +30,8 @@
 #include <projectexplorer/runnables.h>
 #include <utils/qtcassert.h>
 
+#include <QRegExp>
+
 using namespace ProjectExplorer;
 
 namespace Qnx {

src/plugins/qtsupport/qscxmlcgenerator.cpp

@@ -30,9 +30,9 @@
 #include <projectexplorer/target.h>
 #include <utils/qtcassert.h>
 
+#include <QDateTime>
 #include <QLoggingCategory>
 #include <QUuid>
-#include <QDateTime>
 
 using namespace ProjectExplorer;
 

src/plugins/qtsupport/qtkitinformation.cpp

@@ -25,6 +25,8 @@
 
 #include "qtkitinformation.h"
 
+#include <QRegExp>
+
 #include "qtkitconfigwidget.h"
 #include "qtsupportconstants.h"
 #include "qtversionmanager.h"

src/plugins/qtsupport/qtparser.h

@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <QRegExp>
+
 #include "qtsupport_global.h"
 #include <projectexplorer/ioutputparser.h>
 

src/plugins/subversion/subversioneditor.cpp

@@ -34,6 +34,7 @@
 
 #include <QDebug>
 #include <QFileInfo>
+#include <QRegExp>
 #include <QTextCursor>
 #include <QTextBlock>
 

src/plugins/todo/todoitemsprovider.cpp

@@ -39,6 +39,7 @@
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/session.h>
 
+#include <QRegExp>
 #include <QTimer>
 
 using namespace ProjectExplorer;

src/plugins/vcsbase/vcsoutputwindow.cpp

@@ -45,6 +45,7 @@
 #include <QPointer>
 #include <QTextCodec>
 #include <QDir>
+#include <QRegExp>
 #include <QTextStream>
 #include <QTime>
 #include <QPoint>

src/shared/proparser/ioutils.cpp

@@ -27,6 +27,7 @@
 
 #include <qdir.h>
 #include <qfile.h>
+#include <qregexp.h>
 
 #ifdef Q_OS_WIN
 #  include <windows.h>

src/shared/proparser/prowriter.cpp

@@ -28,6 +28,7 @@
 #include "proitems.h"
 
 #include <QDir>
+#include <QRegExp>
 #include <QPair>
 
 using namespace QmakeProjectManager::Internal;