feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.2'

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

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
This commit is contained in:
Oswald Buddenhagen
2014-08-05 14:24:23 +02:00
parent 59b34b6b53 b2ac3fd90c
commit f3a61e8bf7
239 changed files with 3370 additions and 2107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/commonoptionspage.cpp
View File

@@ -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"