Merge remote-tracking branch 'origin/4.7'

Change-Id: I3c5d7e9e8c589ad4425cd89d61e1f572f5cb7997
This commit is contained in:
Eike Ziller
2018-06-19 10:03:28 +02:00
110 changed files with 913 additions and 260 deletions

View File

@@ -73,8 +73,8 @@ public:
}
private:
QWidget *createConfigurationWidget() override { return 0; }
TestConfiguration *m_testConfig = 0;
QWidget *createConfigurationWidget() override { return nullptr; }
TestConfiguration *m_testConfig = nullptr;
};
} // namespace Internal