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

Merge branch '2.7'

Browse Source 
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
This commit is contained in:
Oswald Buddenhagen
2013-05-15 10:21:47 +02:00
parent c6bee7e20e 8ca5b55a0b
commit 6fb94a7b10
63 changed files with 883 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/src/projects/creator-projects-creating.qdoc
View File

@@ -147,6 +147,14 @@
installed on your computer to create and run this type of
projects
\li Qt Quick 2 UI with Controls
Uses a single QML file that contains the main view and that
imports the Qt Quick Controls. You can view the UI in the QML
Scene and you need not build it. This project requires that
you have installed the Qt Quick Controls for your Qt version
(5.1 or later)
\endlist
\li Libraries