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

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
This commit is contained in:
Eike Ziller
2011-11-18 10:16:49 +01:00
parent 826354e3da a8a170a4d4
commit fbd47e25ee
93 changed files with 4807 additions and 1775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/src/overview/creator-getting-started.qdoc
View File

@@ -42,7 +42,6 @@
\if defined(qcmanual)
\o \l{Creating a Qt Quick Application Using Qt Quick Components}
\o \l{Creating a Qt Widget Based Application}
\o \l{Creating a Qt Widget Based Mobile Application}
\endif
\endlist

4
doc/src/overview/creator-issues.qdoc
View File

@@ -57,6 +57,10 @@
switch to the nfs-kernel-server, or create a symlink so that the
settings are stored locally.
\o Qt 4.7.4 is known to contain a bug exposed by g++ 4.6 which triggers
a crash in \QC. For more information, see
\l{https://bugreports.qt.nokia.com/browse/QTBUG-21265}{QTBUG-21265}
\o The Okteta KDE custom widget plugin might be installed as part of
some Linux distributions. It can cause Qt Designer to crash. For
more information, see: