diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-08-20 13:23:06 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-08-20 13:23:13 +0200 |
| commit | 8eaaef96aa55c10f00b429c3e6ade8d8be568141 (patch) | |
| tree | 33ff4239b1523d5f145d0ec5681716859f276e4c /src/plugins/cpaster | |
| parent | 2f781ac28083bc06b549ce69335b4c7901cde61d (diff) | |
| parent | 0173c638537e9a53a439ec4be5a9ab7b10a27a79 (diff) | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: I65968dd02ea6bdd15f304ae567dd0c02238e6949
Diffstat (limited to 'src/plugins/cpaster')
| -rw-r--r-- | src/plugins/cpaster/fileshareprotocolsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cpaster/settingspage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp index e0d46ea838..0805483a8d 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp @@ -99,7 +99,7 @@ FileShareProtocolSettingsPage::FileShareProtocolSettingsPage(const QSharedPointe QObject *parent) : Core::IOptionsPage(parent), m_settings(s), m_widget(0) { - setId("X.FileSharePaster"); + setId("X.CodePaster.FileSharePaster"); setDisplayName(tr("Fileshare")); setCategory(Constants::CPASTER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CodePaster", Constants::CPASTER_SETTINGS_TR_CATEGORY)); diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index a391ffb366..aa32cf3587 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -70,7 +70,7 @@ Settings SettingsWidget::settings() SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings) : m_settings(settings), m_widget(0) { - setId("A.General"); + setId("A.CodePaster.General"); setDisplayName(tr("General")); setCategory(Constants::CPASTER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CodePaster", |