diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
| commit | 428fcb476ba2c5bbe1d16dfe437e510dafce1777 (patch) | |
| tree | 10b130ef79d87dd1339004857c8f1e31e29c3f95 /src/plugins/designer | |
| parent | 9e29a32e1ab3af42a4d70984449ba33b3092a50b (diff) | |
| parent | f4594c922fe3ffcfaf715cf09622ba48c3d1d620 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/libs/utils/settingsaccessor.cpp
src/plugins/autotest/autotestplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
Diffstat (limited to 'src/plugins/designer')
| -rw-r--r-- | src/plugins/designer/settingspage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 04670e5741..248478934a 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -36,6 +36,7 @@ using namespace Designer::Internal; SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) : + Core::IOptionsPage(nullptr, false), m_designerPage(designerPage) { setId(Core::Id::fromString(m_designerPage->name())); |