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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
	doc/src/qtquick/qtquick-creating.qdoc
	doc/src/qtquick/qtquick-uiforms-tutorial.qdoc
	share/qtcreator/welcomescreen/qtcreator_tutorials.xml
	src/plugins/git/gitgrep.cpp
	src/shared/qbs

Change-Id: I6f4d168d888d9547c3af0819f79cc9ebb4186ca0
This commit is contained in:
Eike Ziller
2017-02-14 15:32:04 +01:00
parent 5094cfe019 0115cc3103
commit e724934393
40 changed files with 616 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/qtquick/qtquick-app-tutorial.qdoc
View File

@@ -54,7 +54,7 @@
For examples of using Qt Quick Controls 2, see
\l{Qt Quick Controls 2 Examples}.
\include creator-tutorial-create-qq-project.qdocinc
\include creator-tutorial-create-qq-project.qdocinc qt quick application
\section1 Creating the Main View