feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
12,469 Commits 108 Branches 368 Tags
8abed8a0eeb8968cc1e1e18a934f39820d346d79
Commit Graph

18 Commits

Author SHA1 Message Date
con
39a8e97775 Merge commit origin/2.0 '1a985148340ff3b29c752036857446452cf0907f' 
Conflicts:
	src/plugins/qmldesigner/settingspage.ui
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-07-26 12:26:05 +02:00
ck
9927249665 Maemo: Qemu improvements. 
Get rid of redundancy, add sanity check, better status reporting.
 2010-07-22 12:10:44 +02:00
ck
b1c9784e74 Maemo: Qemu: Bugfix + MADDE workaround. 
Reviewed-by: kh1
 2010-07-21 17:01:33 +02:00
ck
b96df669b1 Maemo: Make device configuration settable from deploy widget. 
This is necessary in case there is no run configuration (e.g. for
library projects).
 2010-07-16 17:11:26 +02:00
hjk
f56dacc76f Core::Context: remove special handling of C_GLOBAL_ID/C_GLOBAL 2010-06-28 14:30:03 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
con
af44136e22 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp
 2010-06-24 11:40:22 +02:00
kh1
83edceafe4 Fix missing update notification if a device config get's added/removed. 
Task-number: QTCREATORBUG-1686
Reviewed-by: ck
 2010-06-21 13:27:43 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
 2010-06-18 16:54:37 +02:00
kh1
a89c171cb1 Use the full path to the qemu executable, might fix QTCREATORBUG-1656. 
Task-number: QTCREATORBUG-1656
 2010-06-17 15:57:08 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
 2010-06-08 10:39:45 +02:00
ck
63ef0d3613 Maemo: Adapt qemu path for Harmattan. 
Reviewed-by: kh1
 2010-06-04 13:14:33 +02:00
Friedemann Kleint
647c5d9b63 ProjectExplorer: Header cleanup in Taskwindow. 
Introduce TaskWindowPrivate, add and reformat some
comments.
 2010-05-27 13:28:07 +02:00
kh1
745345e347 There is no dependency, so make the runtime manager an real singelton. 
Reviewed-by: ck
 2010-05-25 14:55:53 +02:00
ck
986d5472e6 Compile fix. 2010-05-21 09:12:52 +02:00
ck
e6480735f4 Maemo: Compile fix. 2010-05-21 09:11:19 +02:00
kh1
c6fef3ef63 Long overdue changes and refactoring for qemu handling. 
Fixes: - react on build/ run configuration changes
       - now notices environment changes, like switching Qt versions
       - start button is now only shown if we have a valid qemu runtime
       - enabled/ disabled state works properly when loading a project

Task-number: QTCREATOR-210, QTCREATORBUG-1252, QTCREATORBUG-1082
Reviewed-by: ck
 2010-05-20 16:05:23 +02:00
kh1
9109380570 Long overdue changes and refactoring for qemu handling. 
Fixes: - react on build/ run configuration changes
       - now notices environment changes, like switching Qt versions
       - start button is now only shown if we have a valid qemu runtime
       - enabled/ disabled state works properly when loading a project

Task-number: QTCREATOR-210, QTCREATORBUG-1252, QTCREATORBUG-1082
Reviewed-by: ck
 2010-05-20 15:59:29 +02:00