Skip to content

GitLab

Commit 868428cc authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/3.1' 

Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
parents 0d303db8 93184f79
Hide whitespace changes
Inline Side-by-side
doc/config/macros.qdocconf
View file @ 868428cc
......@@ -21,8 +21,7 @@ macro.QD = "Qt Designer"
macro.QL = "Qt Linguist"
macro.QMLD = "Qt Quick Designer"
macro.QQV = "Qt QML Viewer"
macro.QS = "Qt Simulator"
macro.QSDK = "Qt SDK"
macro.QSDK = "Qt"
macro.qtcversion = $QTC_VERSION
macro.param = "\\e"
macro.raisedaster.HTML = "<sup>*</sup>"
......
doc/src/analyze/creator-analyze.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-troubleshooting-debugging.html
\page creator-analyze-mode.html
\nextpage creator-qml-performance-monitor.html
......
doc/src/analyze/creator-valgrind-overview.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-qml-performance-monitor.html
\page creator-valgrind-overview.html
\nextpage creator-analyzer.html
......
doc/src/analyze/creator-valgrind.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-valgrind-overview.html
\page creator-analyzer.html
\nextpage creator-cache-profiler.html
......@@ -133,7 +133,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-analyzer.html
\page creator-cache-profiler.html
\nextpage creator-running-valgrind-remotely.html
......@@ -255,7 +255,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-cache-profiler.html
\page creator-running-valgrind-remotely.html
\nextpage creator-advanced.html
......
doc/src/analyze/qtquick-profiler.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-analyze-mode.html
\page creator-qml-performance-monitor.html
\nextpage creator-valgrind-overview.html
......
doc/src/android/androiddev.qdoc
View file @ 868428cc
......@@ -18,7 +18,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-connecting-mobile.html
\page creator-developing-android.html
\nextpage creator-developing-baremetal.html
......
doc/src/android/creator-android-app-tutorial.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-writing-program.html
\page creator-android-app-tutorial.html
\nextpage creator-project-managing.html
......
doc/src/android/deploying-android.qdoc
View file @ 868428cc
......@@ -18,7 +18,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-deployment.html
\page creator-deploying-android.html
\nextpage creator-deployment-bb10.html
......
doc/src/baremetal/creator-baremetal-dev.qdoc
View file @ 868428cc
......@@ -18,7 +18,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-developing-android.html
\page creator-developing-baremetal.html
\nextpage creator-developing-bb10.html
......
doc/src/debugger/creator-debugger-example.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-debugging-qml.html
\page creator-debugging-example.html
\nextpage creator-qml-debugging-example.html
......
doc/src/debugger/creator-debugger-setup.qdoc
View file @ 868428cc
......@@ -24,7 +24,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-debugging.html
\page creator-debugger-engines.html
\nextpage creator-debugger-operating-modes.html
......
doc/src/debugger/creator-debugger.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-testing.html
\page creator-debugging.html
\nextpage creator-debugger-engines.html
......@@ -91,7 +91,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-debugger-engines.html
\page creator-debugger-operating-modes.html
\nextpage creator-debug-mode.html
......@@ -352,7 +352,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-debugger-operating-modes.html
\page creator-debug-mode.html
\nextpage creator-debugging-helpers.html
......@@ -814,7 +814,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-debug-mode.html
\page creator-debugging-helpers.html
\nextpage creator-debugging-qml.html
......@@ -1130,7 +1130,7 @@
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-qml-debugging-example.html
\page creator-troubleshooting-debugging.html
\nextpage creator-analyze-mode.html
......
doc/src/debugger/qtquick-debugger-example.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-debugging-example.html
\page creator-qml-debugging-example.html
\nextpage creator-troubleshooting-debugging.html
......
doc/src/debugger/qtquick-debugging.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-debugging-helpers.html
\page creator-debugging-qml.html
\nextpage creator-debugging-example.html
......
doc/src/editors/creator-beautifier.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-editor-refactoring.html
\page creator-beautifier.html
\nextpage creator-editor-options.html
......
doc/src/editors/creator-clang-codemodel.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-diff-editor.html
\page creator-clang-codemodel.html
\nextpage creator-finding-overview.html
......
doc/src/editors/creator-coding-edit-mode.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-editor-functions.html
\page creator-coding-navigating.html
\nextpage creator-highlighting.html
......
doc/src/editors/creator-coding.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-usability.html
\page creator-coding.html
\nextpage creator-editor-functions.html
......
doc/src/editors/creator-diff-editor.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-macros.html
\page creator-diff-editor.html
\nextpage creator-clang-codemodel.html
......
doc/src/editors/creator-editors-options-text.qdoc
View file @ 868428cc
......@@ -23,7 +23,7 @@
// **********************************************************************
/*!
\contentspage index.html
\contentspage {Qt Creator Manual}
\previouspage creator-editor-options.html
\page creator-editor-options-text.html
\nextpage creator-editor-fakevim.html
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment