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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggermainwindow.cpp
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/winrt/winrtdevicefactory.cpp
	tests/unit/unittest/gtest-creator-printing.cpp
	tests/unit/unittest/gtest-creator-printing.h
	tests/unit/unittest/unittest.pro

Change-Id: Ie9b80b87a8a4fa81baf72a2daa7919b21371c15e
This commit is contained in:
Eike Ziller
2018-11-06 09:20:00 +01:00
parent 9d296cf1f1 e18cbad285
commit 1473bc5891
229 changed files with 5356 additions and 2822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/debuggermainwindow.cpp
View File

@@ -153,11 +153,11 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent)
});
auto viewButton = new QToolButton;
viewButton->setText(tr("&Views"));
viewButton->setText(DebuggerMainWindow::tr("&Views"));
auto closeButton = new QToolButton();
closeButton->setIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon());
closeButton->setToolTip(tr("Leave Debug Mode"));
closeButton->setToolTip(DebuggerMainWindow::tr("Leave Debug Mode"));
auto toolbar = new Utils::StyledBar;
toolbar->setProperty("topBorder", true);
@@ -187,7 +187,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent)
hbox->addWidget(viewButton);
hbox->addWidget(closeButton);
auto dock = new QDockWidget(tr("Toolbar"), q);
auto dock = new QDockWidget(DebuggerMainWindow::tr("Toolbar"), q);
dock->setObjectName("Toolbar");
dock->setFeatures(QDockWidget::NoDockWidgetFeatures);
dock->setAllowedAreas(Qt::BottomDockWidgetArea);
@@ -482,7 +482,8 @@ void DebuggerMainWindowPrivate::populateCurrentPerspective()
QWidget *central = m_currentPerspective->centralWidget();
m_centralWidgetStack->addWidget(central ? central : m_editorPlaceHolder);
q->showCentralWidgetAction()->setText(central ? central->windowTitle() : tr("Editor"));
q->showCentralWidgetAction()->setText(central ? central->windowTitle()
: DebuggerMainWindow::tr("Editor"));
m_statusLabel->clear();