Merge remote-tracking branch 'origin/2.3'

Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300

2 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/valgrind/xmlprotocol/error.cpp b/src/plugins/valgrind/xmlprotocol/error.cpp
index 3742456142..70c7f5427c 100644
--- a/src/plugins/valgrind/xmlprotocol/error.cpp
+++ b/src/plugins/valgrind/xmlprotocol/error.cpp
@@ -248,7 +248,7 @@ QString Error::toXml() const
             if (!frame.file().isEmpty()) {
                 stream << "      <file>" << frame.file() << "</file>\n";
             }
-            if (!frame.line() == -1) {
+            if (frame.line() != -1) {
                 stream << "      <line>" << frame.line() << "</line>";
             }
             stream << "    </frame>\n";
diff --git a/src/plugins/valgrind/xmlprotocol/frame.cpp b/src/plugins/valgrind/xmlprotocol/frame.cpp
index 9b36a4a368..876af1bf27 100644
--- a/src/plugins/valgrind/xmlprotocol/frame.cpp
+++ b/src/plugins/valgrind/xmlprotocol/frame.cpp
@@ -43,9 +43,7 @@ namespace XmlProtocol {
 class Frame::Private : public QSharedData
 {
 public:
-    explicit Private() :
-        ip(0), line( -1 )
-    {}
+    Private() : ip(0), line(-1) {}
 
     bool operator==(const Private &other) const
     {
@@ -74,7 +72,7 @@ Frame::~Frame()
 }
 
 Frame::Frame(const Frame &other) :
-    d( other.d )
+    d(other.d)
 {
 }