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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
This commit is contained in:
Eike Ziller
2012-11-27 11:50:56 +01:00
parent c384f52b49 deeef5308f
commit ba1d5f2cdf
44 changed files with 276 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
doc/src/qtquick/qtquick-creating.qdoc
View File

@@ -64,15 +64,17 @@
need to have the development environment installed on your
computer to create and run this type of project.
\o \gui {Qt Quick Application (from Existing QML File)} converts
existing QML applications to Qt Quick application projects. This
enables you to run them from \QC and to deploy them to mobile
\o \gui {Qt Quick 1 Application (from Existing QML File)} converts
existing Qt Quick 1 applications to Qt Quick application projects.
This enables you to run them from \QC and to deploy them to mobile
devices.
\o \gui {Custom QML Extension Plugin} (in the \gui Libraries category)
creates a C++ plugin that makes
it possible to offer extensions that can be loaded dynamically into
applications by using the QDeclarativeEngine class.
\o \gui {Qt Quick Extension Plugins} (in the \gui Libraries category)
create C++ plugins that make it possible to offer extensions that
can be loaded dynamically into Qt Quick applications. Select
\gui {Qt Quick 1 Extension Plugin} to create extensions for
Qt Quick 1 applications and \gui {Qt Quick 2 Extension Plugin} to
create extensions for Qt Quick 2 applications.
\endlist