feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,904 Commits 108 Branches 368 Tags
94548a1e1fbaf245da440bdf57a40e0c34bc88b9
Commit Graph

29 Commits

Author SHA1 Message Date
dt
6c61ea2251 Project Wizards: Make the categorie names reflect the contents 
Also reorder the contents to have Qt Quick on top. Move Console Qt
to Other Projects.

Qt QWidget project isn't the best name, but the new structure is a
improvement so using it for now.

Task-Nr: QTCREATORBUG-3513

Ack-By: con
Ack-By: kkoehne
 2011-01-24 17:30:31 +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
Kai Koehne
33d66233b5 QmlWizards: Use 'QtQuick 1.0' namespace 
Use the 'QtQuick 1.0' namespace introduced in 4.7.1. This makes them in
line with the examples/demos we ship in the SDK, but breaks for 4.7.0
(e.g. N900).

Task-number: QTCREATORBUG-3243
 2010-12-07 11:27:30 +01:00
Kai Koehne
e35c53e7f8 QmlWizards: Unify templates 
Unify the original qml file generated by Qt Quick UI / Qt Quick
Application wizards. Use a default size of 360x360.
Furthermore, add a MouseArea such that clicking on the app will close
it (demonstrating the use of Qt.quit()).

Reviewed-by: Alessandro Portale
 2010-11-12 13:54:54 +01:00
Thomas Hartmann
fefc6cfe6d Using import Qt 4.7 (again) 
We have to support the  N900

Reviewed-by: dt
 2010-10-06 13:35:47 +02:00
Thomas Hartmann
defb9881b1 QmlWizards: use QtQuick 1.0 instead of Qt 4.7 
Reviewed-by: Kai Koehne
 2010-10-04 16:21:32 +02:00
Christian Kandeler
36b17fd974 Wizards: Move QML standalone app wizard to QML category. 
Task-number: QTCREATORBUG-2510
Reviewed-by: Alessandro Portale
 2010-10-04 14:52:56 +02:00
Christian Kandeler
f615efeced QML wizards: Change names and descriptions. 
Reviewed-by: Leena Miettinen
 2010-09-28 14:46:59 +02:00
Friedemann Kleint
7e739985b2 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
 2010-08-06 10:46:50 +02:00
Friedemann Kleint
111b89d755 QML: Name wizards correctly. 
Reviewed-by: Carsten Owerfeldt <carsten.owerfeldt@nokia.com>
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
 2010-08-05 16:54:04 +02:00
Alessandro Portale
ede8cae919 Remove the icon size hack for QML_WIZARD_ICON 2010-07-09 20:02:34 +02:00
Christian Kamm
51a75e3c20 QmlJS: Remove spurious spaces from default import path in qmlproject. 
What about paths that actually contain spaces?

Reviewed-by: Erik Verbruggen
 2010-06-24 13:46:53 +02:00
Daniel Molkentin
9d609c88c8 Revert "Mark QML support in Qt Creator 2.0 as preview" 
Not needed anymore after the general QML support got deactivated.

This reverts commit 74bd95d323.
 2010-06-01 14:40:06 +02:00
Daniel Molkentin
74bd95d323 Mark QML support in Qt Creator 2.0 as preview 
Reviewed-by: Kai Koehne
 2010-05-31 16:37:17 +02:00
con
2d17da65a9 Icon update. 2010-05-18 14:26:33 +02:00
Daniel Molkentin
bf95a99c51 New texts for the wizard types in the new dialog 
Reviewed-by: Leena Miettinen
 2010-05-12 14:16:49 +02:00
Friedemann Kleint
0a643a1994 Wizards: Open a relevant file in editor after the wizard run 
Remove all hacks/conventions of considering the last generated
file as project file, etc. and instead add attributes flags to
Core::GeneratedFile, giving fine-grained control of what to do
with the file. Implement static utility functions in wizards
that handle it. Add boolean XML-attributes "openeditor"/"openproject"
to the file elements used by the CustomWizard XML-specification.
Manually set the attributes in all wizards.

Task-number: QTCREATORBUG-1166
 2010-04-16 15:55:38 +02:00
Kai Koehne
e959967f11 Qml support: Bump version of qml files from Qt 4.6 to Qt 4.7 
Reviewed-by: Thomas Hartmann
 2010-04-13 15:15:16 +02:00
Jarek Kobus
20c0817a3f Replace QWizard with Utils::Wizard 2010-03-31 15:22:14 +02:00
Kai Koehne
3984c057b8 QmlProject file format: Let filters recurse by default 
E.g. "QmlFiles {}" now also monitors subdirectories by default, while
"QmlFiles { paths : ["bla.qml"] } does not.

Task-number: BAUHAUS-503
 2010-03-22 10:21:18 +01:00
Kai Koehne
89ef33557f QmlProjectManager: Show user how to set plugin paths in .qmlproject file 
Suggested by Erik Verbruggen
 2010-03-19 15:15:36 +01:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +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
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger
93d3205459 Update Wizards to new signature 
Seems like I missed some the first time round. Sorry for that!
 2010-02-18 16:10:56 +01:00
Kai Koehne
06abd3b59d Renaming Qml wizards 
Unify names to QmlProjectApplicationWizard & QmlProjectImportWizard
 2010-02-18 15:34:17 +01:00