diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/android/androiddevice.cpp | 3 | ||||
-rw-r--r-- | src/plugins/clangcodemodel/clangdclient.cpp | 2 | ||||
-rw-r--r-- | src/plugins/studiowelcome/studiowelcomeplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/welcome/welcomeplugin.cpp | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 8a795780519..1ede608bdd1 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -639,7 +639,8 @@ void AndroidDeviceManager::HandleAvdsListChange() // of the device has changed, remove it and register it again with the new name. // Also account for the case of an AVD registered through old QC which might have // invalid data by checking the sdcard size value. - if (dev->displayName() != displayName || androidDev->sdcardSize() == tr("Unknown")) { + if (dev->displayName() != displayName + || androidDev->sdcardSize() == AndroidDevice::tr("Unknown")) { devMgr->removeDevice(dev->id()); } else { // Find the state of the AVD retrieved from the AVD watcher diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp index 50bd7ee24ab..216b90da654 100644 --- a/src/plugins/clangcodemodel/clangdclient.cpp +++ b/src/plugins/clangcodemodel/clangdclient.cpp @@ -4021,7 +4021,7 @@ class MemoryTreeModel : public Utils::BaseTreeModel public: MemoryTreeModel(QObject *parent) : BaseTreeModel(parent) { - setHeader({tr("Component"), tr("Total Memory")}); + setHeader({MemoryUsageWidget::tr("Component"), MemoryUsageWidget::tr("Total Memory")}); } void update(const MemoryTree &tree) diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.h b/src/plugins/studiowelcome/studiowelcomeplugin.h index cd6b8ea87f2..1fdc811d37e 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.h +++ b/src/plugins/studiowelcome/studiowelcomeplugin.h @@ -38,6 +38,8 @@ namespace Internal { class StudioSettingsPage : public Core::IOptionsPageWidget { + Q_OBJECT + public: void apply() final; diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index ef4c969be66..938e776ac87 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -110,6 +110,8 @@ void ResizeSignallingWidget::resizeEvent(QResizeEvent *event) class WelcomeMode : public IMode { + Q_OBJECT + public: WelcomeMode(); ~WelcomeMode(); |