summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-06-26 14:25:03 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-26 17:03:18 +0200
commit5a8f7939f536096a3f512c8b1537e6bbe5f0269c (patch)
tree1076e7ec1073d248e95ad5f1fae0e91a5572b958 /tools
parent37e014504c6b54762b9e43a30d4b0b0abdc15db6 (diff)
Replace QWeakPointer with QPointer for tracking QObjects
QWeakPointer support for assigning QObjects is deprecated. Use QPointer instead. This is required to compile with the deprecated API disabled. Change-Id: I5b5c9b261d66c297b57889ce072f4bdf98613e36 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 6d6adde9..0c838d57 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -45,6 +45,7 @@
#include <QAtomicInt>
#include <QLibraryInfo>
#include <QProcess>
+#include <QPointer>
#include <QWidget>
#include <QApplication>
@@ -76,7 +77,7 @@ void exitApp(int i)
exit(i);
}
-QWeakPointer<LoggerWidget> logger;
+QPointer<LoggerWidget> logger;
static QAtomicInt recursiveLock(0);
void myMessageOutput(QtMsgType type, const char *msg)