feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
70,489 Commits 108 Branches 368 Tags
c2aeec7e86ec7b7929ad48bfdd7bede6cf5239d0
Commit Graph

297 Commits

Author SHA1 Message Date
dt
67cfb7e078 Qt4projectManager: Refactor Qt4Target, split up in per target classes 
Almost(*) all of the symbian and maemo specific code is now theoretically
moveable to a separate plugin. Thus making it possible to implement
new targets in a plugin.

(*) Noteable missing is the qtversion, which needs to be split up
per target too.

Also fixes
Task-Nr: QTCREATORBUG-2440

Reviewed-By: hunger
Reviewed-By: ck
 2011-01-17 14:13:40 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Kai Koehne
c4e4913870 QmlProject: Add mainFile property 
The mainFile property of QmlProject is the default file to run. People
have still the opportunity to override this in their run settings,
though.

The wizard generated code was updated accordingly. Note that this makes
projects generated by the wizard incompatible with QtCreator 2.1!

Task-number: QTCREATORBUG-3249
 2010-12-08 15:08:49 +01:00
dt
8697072ce4 ProjectExplorer: Move ITargetFactory to object pool 
Makes multiple target factories per project possible

Reviewed-By: hunger
 2010-12-07 13:17:12 +01:00
dt
b477441ef9 ProjectExplorer: Move configWidget from Project to Target 
Reviewed-By: hunger
 2010-12-06 14:15:06 +01:00
Christian Kamm
528999d549 qmldump: Ensure path and environment are taken from the same Qt version. 
Fixes f1fb0bddb1.

Reviewed-by: Kai Koehne
 2010-10-26 16:30:49 +02:00
Friedemann Kleint
f1fb0bddb1 Debugger/JS Code model: Set environment for QML tools correctly. 
Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-2883
 2010-10-26 15:39:37 +02:00
Christian Kamm
404186a919 QmlProject: Tell the code model about the target Qt's import path. 
Task-number: QTCREATORBUG-2639
Reviewed-by: Thomas Hartmann
 2010-10-13 13:31:31 +02:00
Christian Kamm
00a8d9c32b QmlJS: Try to build qmldump when opening a Qml project. 
To make plugin dumping work without having to compile the debugging
helpers explicitly.

Reviewed-by: Kai Koehne
 2010-09-30 15:10:33 +02:00
Christian Kamm
b87f0bfdcf QmlJS: Fix qmldump not working for qmlproject projects. 
Reviewed-by: Erik Verbruggen
 2010-09-29 17:54:51 +02:00
Kai Koehne
6af84642b5 QmlProject: Fix memory leak 
Explicitly delete the root project item when closing a QmlProject.
 2010-09-24 14:31:28 +02:00
Christian Kamm
16b4e4e91f QmlJS: Fix import path handling in the model manager. 
Previously, the model manager always had exactly one import path - but
you can open more than one Qml project at once. Now, we store the union
of all import paths in the model manager.

Reviewed-by: Roberto Raggi
 2010-06-22 13:25:22 +02:00
con
b0040dc858 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
 2010-06-10 15:00:16 +02:00
Roberto Raggi
726c3345c4 Moved qmljsmodelmanagerinterface.h 2010-06-10 11:59:27 +02:00
Kai Koehne
740717f060 Fix crash when loading a .qmlproject with a custom run configuration 
Task-number: QTCREATORBUG-1609
 2010-06-09 16:22:27 +02:00
Kai Koehne
dc38ed3372 QuickDesigner: Fix compilation with latest qt.git 
the method name got changed in 5732a440.
 2010-05-20 10:00:30 +02:00
Erik Verbruggen
ef66bc98e2 Fixed QTCREATORBUG-1397. 
When adding a new file, refreshing semantic errors in the open editor should
have worked. It now also works for removing existing files.

Done-with: Christian Kamm
 2010-05-19 14:46:08 +02:00
Erik Verbruggen
124bb7aad7 Emit extra signals to have the task manager show issues on project-load. 2010-04-16 13:09:44 +02:00
Erik Verbruggen
d88eaff481 Hooked up the QML task manager again. 
The QML task manager behaviour is to show warnings/errors for _saved_ files
only.
 2010-04-16 12:55:00 +02:00
Christian Kamm
9402fad726 QmlJSEditor: Build Snapshot by looking at imports of parsed files. 
Previously we just scanned every directory containing a qml file for
other qml files.

This makes import ".." work.

Reviewed-by: Erik Verbruggen
 2010-04-06 09:53:57 +02:00
Christian Kamm
9408378a24 QmlJSEditor: Fix file/directory imports for qml files not in a project. 
Reviewed-by: Roberto Raggi
 2010-03-31 14:55:35 +02:00
dt
a3f827b1b8 Remove isApplication() and simplfy startup project logic 2010-03-25 17:36:39 +01:00
Christian Kamm
a3187addc5 QmlProjectManager: more libraryPaths -> importPaths renames. 
See c722282cf3.
 2010-03-21 09:36:54 +01:00
Kai Koehne
c722282cf3 QmlProjectManager: Rename 'libraryPaths' property to 'importPaths' 
Suggested by Erik Verbruggen
 2010-03-19 15:15:36 +01:00
Christian Kamm
9ea01cf5fb Improve Qml code model import handling. 
* Fill the snapshot with files that could be imported.
* Implement package imports.

* The qmldir file is not parsed yet.

Reviewed-by: Erik Verbruggen
 2010-03-18 11:25:37 +01:00
Thomas Hartmann
6949453c08 QmlProjectManager: crash fix 2010-03-11 11:30:15 +01:00
Lasse Holmstedt
61ca001e67 QML project executable file to default to lowercase .qml file 
Use a lowercase .qml file found in project tree if no current file is
selected. This way we don't have to disable run controls if there are
some files to execute.

Reviewed-by: kkoehne
 2010-03-08 14:39:46 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Kai Koehne
4c59f3f2ce QmlProjectManager: Fix compilation with latest changes of QDeclarative 
All files have been renamed from Qml to QDeclarative.
Registration of types is now done in an initializer method.
 2010-02-26 14:46:04 +01:00
Kai Koehne
fb8357136e Remove support for old .qmlproject file format 
We used to fail back to the old format if the .qmlproject file
was invalid. Anyhow, this lead to weird effects ... better disable
it explicitly.

That no warning is shown right now when loading an invalid qmlproject
file is a bug in coreplugin.
 2010-02-17 16:32:41 +01:00
Lasse Holmstedt
b031b206c0 Cleaned up qmlinspector and qmlproject and removed 
metatype redefinition
 2010-02-17 13:08:29 +01:00
Kai Koehne
b5646d35da Don't show error message if file added to qmlproject is picked up 
Check for the case that a new file to be added to a .qmlproject
is also automatically covered e.g. by a wildcard filter. In this
case we don't have to do anything.
 2010-02-17 11:22:37 +01:00
Lasse Holmstedt
4e5089d90d Merge branch 'debugintegration' 
Conflicts:
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
 2010-02-16 16:30:41 +01:00
Lasse Holmstedt
580280af26 Changed QML Inspector from a separate global mode to a plugin. 
The new QML Inspector depends on DebuggerPlugin. Also added a dropdown menu into
the debugger toolbar from which the user can select the used debugging
language, e.g. C++ or QML.
 2010-02-16 15:13:09 +01:00
Kai Koehne
fdd85b7f33 QmlProjectManager refactoring 
Putting every class in it's own files + avoid "using namespace"
 2010-02-16 13:43:27 +01:00
Roberto Raggi
2a63387085 Renamed qmlmodelmanager. 2010-02-15 13:49:00 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support 
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
 2010-02-09 16:57:37 +01:00
Tobias Hunger
8224a907e7 Set newly created runconfiguration active in QML project 2010-02-04 11:54:11 +01:00
Kai Koehne
d5326f37c0 Pass library paths specified in .qmlproject file on to qmlviewer 2010-02-03 09:13:53 +01:00
Tobias Hunger
788b294a30 Make project use toMap/fromMap to save state 
* That is what everybody else is using now.

Reviewed-by: dt
 2010-02-01 12:23:14 +01:00
Tobias Hunger
4ee223d45d Add a id() method to projects 
* This makes it easier to distinguish projects in the
   userfileaccessor
 2010-02-01 12:23:14 +01:00
Tobias Hunger
f923a561c3 Make use of ProjectConfiguration in RunConfigurations 
Reviewed-by: dt
 2010-02-01 12:23:13 +01:00
Kai Koehne
269506c99c Add new JavaScriptFiles & ImageFiles element to .qmlproject file format 2010-01-29 12:15:47 +01:00
Kai Koehne
20801bee30 Update project tree if .qmlproject file / included directories change 2010-01-29 12:13:11 +01:00
Kai Koehne
32ac14c27a Wire up new project file format in Project Manager 
Old format is still available as a fallback.
 2010-01-29 12:13:11 +01:00
Kai Koehne
c5bc134732 Remove unused dummy method 2010-01-27 13:32:14 +01:00
Erik Verbruggen
96e31c2a0f Started merging the JS and QML editor plug-ins. 2010-01-15 17:20:19 +01:00
Kai Koehne
2e36b9a34a Make sure that the qmlviewer from the binary package is always used 
The custom creator-qml installer comes with a qmlviewer installed
in creator/bin. Make sure that this qmlviewer is used to run .qmlproject
files, even though there might be other qmlviewer binaries in the
PATH.
 2010-01-12 13:59:35 +01:00