Merge remote-tracking branch 'origin/3.2'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp
index 82a488cf8f0..87f0229de19 100644
--- a/src/plugins/debugger/commonoptionspage.cpp
+++ b/src/plugins/debugger/commonoptionspage.cpp
@@ -55,6 +55,8 @@ namespace Internal {
 
 class CommonOptionsPageWidget : public QWidget
 {
+    Q_OBJECT
+
 public:
     explicit CommonOptionsPageWidget(const QSharedPointer<Utils::SavedActionSet> &group);
 
@@ -395,7 +397,7 @@ QWidget *LocalsAndExpressionsOptionsPage::widget()
         layout1->addRow(checkBoxShowQtNamespace);
         layout1->addItem(new QSpacerItem(10, 10));
         layout1->addRow(tr("Maximum string length:"), spinBoxMaximalStringLength);
-        layout1->addRow(tr("Displayh string length:"), spinBoxDisplayStringLimit);
+        layout1->addRow(tr("Display string length:"), spinBoxDisplayStringLimit);
 
         auto lowerLayout = new QHBoxLayout;
         lowerLayout->addLayout(layout1);
@@ -429,3 +431,5 @@ QWidget *LocalsAndExpressionsOptionsPage::widget()
 
 } // namespace Internal
 } // namespace Debugger
+
+#include "commonoptionspage.moc"