Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	share/qtcreator/debugger/creatortypes.py
	src/plugins/beautifier/clangformat/clangformat.cpp

Change-Id: I1ab281c190767ced8a6ac2c026a121ea229a36cf

share/qtcreator/debugger/creatortypes.py

@@ -228,3 +228,7 @@ def qdump__ProKey(d, value):
     qdump__ProString(d, value)
     d.putBetterType(value.type)
 
+def qdump__Core__GeneratedFile(d, value):
+    d.putStringValue(value["m_d"]["d"]["path"])
+    d.putPlainChildren(value)
+

share/qtcreator/debugger/qttypes.py

@@ -70,7 +70,7 @@ def qdump__QByteArray(d, value):
     if d.isExpanded():
         d.putArrayData(data, size, d.charType())
 
-def qdump__QByteArrayData(d, value):
+def qdump__QArrayData(d, value):
     data, size, alloc = d.byteArrayDataHelper(d.addressOf(value))
     d.check(alloc == 0 or (0 <= size and size <= alloc and alloc <= 100000000))
     d.putValue(d.readMemory(data, size), "latin1")
@@ -80,6 +80,9 @@ def qdump__QByteArrayData(d, value):
             d.putIntItem("size", size)
             d.putIntItem("alloc", alloc)
 
+def qdump__QByteArrayData(d, value):
+    qdump__QArrayData(d, value)
+
 
 def qdump__QBitArray(d, value):
     data, basize, alloc = d.byteArrayDataHelper(d.extractPointer(value["d"]))

src/libs/3rdparty/botan/botan.cpp

@@ -379,7 +379,7 @@ class Mutex
       * Unlock the mutex
       */
       virtual void unlock() = 0;
-      virtual ~Mutex() {}
+      virtual ~Mutex() Q_DECL_NOEXCEPT_EXPR(false) {}
    };
 
 /**
@@ -3296,7 +3296,7 @@ void* MemoryMapping_Allocator::alloc_block(size_t n)
                throw MemoryMapping_Failed("Could not unlink temporary file");
             }
 
-         ~TemporaryFile()
+         ~TemporaryFile() Q_DECL_NOEXCEPT_EXPR(false)
             {
             /*
             * We can safely close here, because post-mmap the file

src/libs/3rdparty/botan/botan.h

@@ -390,7 +390,7 @@ class BOTAN_DLL Allocator
       */
       virtual void destroy() {}
 
-      virtual ~Allocator() {}
+      virtual ~Allocator() Q_DECL_NOEXCEPT_EXPR(false) {}
    };
 
 }

src/plugins/beautifier/clangformat/clangformat.cpp

@@ -128,7 +128,7 @@ Command ClangFormat::command(int offset, int length) const
 
     if (m_settings->usePredefinedStyle()) {
         command.addOption("-style=" + m_settings->predefinedStyle());
-        command.addOption("-assume-filename=%filename");
+        command.addOption("-assume-filename=%file");
     } else {
         command.addOption("-style=file");
         const QString path =

src/plugins/texteditor/texteditor.cpp

@@ -794,17 +794,17 @@ static void printPage(int index, QPainter *painter, const QTextDocument *doc,
     painter->save();
 
     painter->translate(body.left(), body.top() - (index - 1) * body.height());
-    QRectF view(0, (index - 1) * body.height(), body.width(), body.height());
+    const QRectF view(0, (index - 1) * body.height(), body.width(), body.height());
 
     QAbstractTextDocumentLayout *layout = doc->documentLayout();
     QAbstractTextDocumentLayout::PaintContext ctx;
 
     painter->setFont(QFont(doc->defaultFont()));
-    QRectF box = titleBox.translated(0, view.top());
-    int dpix = painter->device()->logicalDpiX();
-    int dpiy = painter->device()->logicalDpiY();
-    int mx = 5 * dpix / 72.0;
-    int my = 2 * dpiy / 72.0;
+    const QRectF box = titleBox.translated(0, view.top());
+    const int dpix = painter->device()->logicalDpiX();
+    const int dpiy = painter->device()->logicalDpiY();
+    const int mx = 5 * dpix / 72.0;
+    const int my = 2 * dpiy / 72.0;
     painter->fillRect(box.adjusted(-mx, -my, mx, my), QColor(210, 210, 210));
     if (!title.isEmpty())
         painter->drawText(box, Qt::AlignCenter, title);

src/plugins/valgrind/memchecktool.cpp

@@ -157,7 +157,7 @@ void MemcheckErrorFilterProxyModel::setAcceptedKinds(const QList<int> &acceptedK
 {
     if (m_acceptedKinds != acceptedKinds) {
         m_acceptedKinds = acceptedKinds;
-        invalidate();
+        invalidateFilter();
     }
 }
 
@@ -165,7 +165,7 @@ void MemcheckErrorFilterProxyModel::setFilterExternalIssues(bool filter)
 {
     if (m_filterExternalIssues != filter) {
         m_filterExternalIssues = filter;
-        invalidate();
+        invalidateFilter();
     }
 }