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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/boot2qt/qdbrunconfiguration.cpp
	src/plugins/boot2qt/qdbrunconfiguration.h
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qnx/qnxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.h

Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21
This commit is contained in:
Eike Ziller
2019-12-16 16:19:44 +01:00
parent 3dfa188182 0d005b7057
commit 267946d100
82 changed files with 678 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/coreconstants.h
View File

@@ -125,8 +125,6 @@ const char CLOSE_ALTERNATIVE[] = "QtCreator.Close_Alternative"; // temporary
const char CLOSEALL[] = "QtCreator.CloseAll";
const char CLOSEOTHERS[] = "QtCreator.CloseOthers";
const char CLOSEALLEXCEPTVISIBLE[] = "QtCreator.CloseAllExceptVisible";
const char GOTONEXT[] = "QtCreator.GotoNext";
const char GOTOPREV[] = "QtCreator.GotoPrevious";
const char GOTONEXTINHISTORY[] = "QtCreator.GotoNextInHistory";
const char GOTOPREVINHISTORY[] = "QtCreator.GotoPreviousInHistory";
const char GO_BACK[] = "QtCreator.GoBack";