Merge remote-tracking branch 'origin/4.0'

Conflicts:
	src/plugins/autotest/testcodeparser.cpp
	src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
	tests/unit/unittest/unittest.pro

Change-Id: I9db4fbea6ea7c9fdd0d8e1703735af20c92e754b
This commit is contained in:
Eike Ziller
2016-05-09 16:37:41 +02:00
124 changed files with 12956 additions and 12418 deletions

View File

@@ -146,6 +146,8 @@ public:
static QString platformName();
static bool isInitializationDone();
signals:
void objectAdded(QObject *obj);
void aboutToRemoveObject(QObject *obj);