feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,741 Commits 108 Branches 368 Tags
f8ef0fac136d48e4ddc1df260bab4344ca812bc8
Commit Graph

26 Commits

Author SHA1 Message Date
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
Jarek Kobus
4d69c7455e Remove unused constants, fix lacking virtual destructor 
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-04-14 12:08:47 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01: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
Lasse Holmstedt
b580a0c357 QmlDebugging: Use -qmljsdebugger command line argument 
Adapt to latest changes in qt.git (commit
a9e5329168c)

Reviewed-by: kkoehne
 2010-09-20 12:18:59 +02:00
dt
3ef43f56c7 Move qmltaskmanager from qmlproject plugin to qmljseditor 2010-07-14 13:01:43 +02:00
con
2d17da65a9 Icon update. 2010-05-18 14:26:33 +02:00
Lasse Holmstedt
990ec1be91 Added debugging mode for simultaneous QML and C++ debugging 
It's not yet possible to attach to an external app running a qml
debugging server, because the server is only started on startup if an
env variable is set. Changing this requires action from Brisbane, but
even the current solution works for C++ apps with QML in them.

Task-number: BAUHAUS-585
Reviewed-by: dt
 2010-04-15 15:08:32 +02:00
Christiaan Janssen
520108cbc8 Fix crash when restoring old .qmlproject files 
The run configuration id changed, leaving restored qmlproject without
any run configuration.

Reviewed-by: kkoehne
 2010-03-31 10:38:13 +02: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
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
Kai Koehne
5c16f706c6 Replace .qmlproject default editor with the .qml one 
Extend logic for mimetype matching in QmlJsEditor: Also
handle sub-mimetypes like x-application-qmlproject, which
extends x-application-qml.
 2010-01-29 12:14:42 +01:00
con
d4be77b48f Reorder the "new" wizard categories. 2010-01-15 11:07:50 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Kai Koehne
925c686d85 Listening Qml syntax errors in Tasks window 2009-11-11 10:12:51 +01:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory... 
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
 2009-09-25 11:35:44 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Roberto Raggi
18cba96a19 Dummy implementation of MakeStep. 2009-05-22 12:46:06 +02:00
Roberto Raggi
8f9bc24d93 Introduced LANG_QML 2009-05-07 12:42:20 +02:00
Roberto Raggi
b191f15486 Implemented the run configration factory and removed some obsoleted code. 2009-05-07 12:27:52 +02:00
Roberto Raggi
cd9bd8d56d Changed the .qmlproject file format. 2009-05-06 15:56:54 +02:00
Roberto Raggi
9d676f75db Initial work on the QML project manager. 2009-05-04 12:19:22 +02:00