feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
14,931 Commits 108 Branches 368 Tags
e160f071ce16dc46fdeaa03b985fe8d44fb58608
Commit Graph

27 Commits

Author SHA1 Message Date
hjk
e6dd3ff5f0 version bump 2.0.91 -> 2.1.81 
Should have been done earlier. 2.1.80 was burned in the pre-2.1.0->2.0.1
days, and we'd like to have odd subminor for 'working' and even subminor
numbers for pure cherry-picking release branches anyway.
 2010-09-30 13:49:10 +02:00
hjk
4389f02097 version bump 2.0.90 -> 2.0.91 2010-09-27 16:57:34 +02:00
hjk
63bc8a0050 replace version 2.1.80 by 2.0.90 2010-08-30 10:38:38 +02:00
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline 
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
 2010-08-23 16:00:24 +02:00
Kai Koehne
60fffda9eb QmlProject: Search for qmlviewer in configured Qt versions (if not found in $PATH) 
If no 'qmlviewer' executable is found in the PATH, iterate through the
list of configured Qt versions and try to find a qmlviewer there. This
should help users configuring creator such to play with Qml.

Right now the first qmlviewer found in a Qt version is selected. A UI
to let the user select one explicitly was not possible any more (string
freeze).

This requires a dependency from QmlProjectManager to
Qt4ProjectManager.

Reviewed-by: dt
 2010-08-19 17:22:13 +02:00
con
6bd790bd0f Version bump 2010-07-22 18:05:53 +02:00
con
2e10016210 Version update to match the planned version naming. 2010-06-11 16:41:11 +02:00
con
9250d0007d Version update to match the planned version naming. 2010-06-11 16:37:10 +02:00
con
d326c16747 Version bump. 2010-06-07 13:45:49 +02:00
con
84d9b647ee Version bump. 2010-04-30 11:58:05 +02:00
con
ded5ed975a Version bump 2010-03-31 18:06:02 +02:00
kh1
38151c2979 Remove help dependency from qmljseditor. 
Should have been part of 9aaf2ec84c

Reviewed-by: dt
Reviewed: erikv, con
 2010-03-31 14:36:20 +02:00
Lasse Holmstedt
c7049d80f2 Added FIXME and fixed qmlprojectmanager pluginspec 2010-03-18 14:48:30 +01:00
Kai Koehne
718dd06ed8 Make use of QML, Qml, and Quick consistent 
- It's QML, not Qml. But this is only the file format.
- The umbrella term is Quick (or Qt Quick, to be sorted out)
 2010-03-18 10:50:51 +01:00
Lasse Holmstedt
68c49a65e9 Plugin manager for enabling/disabling plugins 
Go to About Plugins and enable/disable plugins from there.

Reviewed-by: mae
 2010-03-12 16:02:42 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
con
58703ba73d Version bump. 2010-03-01 17:57:37 +01:00
Erik Verbruggen
96e31c2a0f Started merging the JS and QML editor plug-ins. 2010-01-15 17:20:19 +01:00
Alessandro Portale
20b209858b Improved line wrapping of plugin license texts. 
The paragraphs are now long lines that get wrapped by the text browser.

Reviewed-by: TrustMe

	modified:   src/plugins/bineditor/BinEditor.pluginspec
	modified:   src/plugins/bookmarks/Bookmarks.pluginspec
	modified:   src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	modified:   src/plugins/coreplugin/Core.pluginspec
	modified:   src/plugins/cpaster/CodePaster.pluginspec
	modified:   src/plugins/cppeditor/CppEditor.pluginspec
	modified:   src/plugins/cpptools/CppTools.pluginspec
	modified:   src/plugins/cvs/CVS.pluginspec
	modified:   src/plugins/debugger/Debugger.pluginspec
	modified:   src/plugins/designer/Designer.pluginspec
	modified:   src/plugins/fakevim/FakeVim.pluginspec
	modified:   src/plugins/find/Find.pluginspec
	modified:   src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	modified:   src/plugins/git/ScmGit.pluginspec
	modified:   src/plugins/helloworld/HelloWorld.pluginspec
	modified:   src/plugins/help/Help.pluginspec
	modified:   src/plugins/locator/Locator.pluginspec
	modified:   src/plugins/mercurial/Mercurial.pluginspec
	modified:   src/plugins/perforce/Perforce.pluginspec
	modified:   src/plugins/projectexplorer/ProjectExplorer.pluginspec
	modified:   src/plugins/qmleditor/QmlEditor.pluginspec
	modified:   src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	modified:   src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	modified:   src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	modified:   src/plugins/regexp/RegExp.pluginspec
	modified:   src/plugins/resourceeditor/ResourceEditor.pluginspec
	modified:   src/plugins/snippets/Snippets.pluginspec
	modified:   src/plugins/subversion/Subversion.pluginspec
	modified:   src/plugins/texteditor/TextEditor.pluginspec
	modified:   src/plugins/vcsbase/VCSBase.pluginspec
	modified:   src/plugins/welcome/Welcome.pluginspec
 2009-11-20 14:32:42 +01:00
Kai Koehne
5e637f3831 Fix dependencies for QmlProjectManager 2009-11-10 10:32:20 +01:00
con
b19d76d903 Version bump. 2009-10-02 16:27:03 +02:00
con
1de6a6e716 Version bump. 2009-10-02 16:21:39 +02:00
con
32e0340eab Version bump. 2009-09-10 17:02:57 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
57cd26548e Version bump also in master. 2009-06-04 11:00:28 +02:00
con
e9b2613dc0 Version bump. 2009-06-02 15:34:58 +02:00
Roberto Raggi
9d676f75db Initial work on the QML project manager. 2009-05-04 12:19:22 +02:00