Commit Graph

201 Commits

Author SHA1 Message Date
Christian Kamm
9ad73fc93b QmlProject: Refresh the project when the Qt version changes.
Reviewed-by: Thomas Hartmann
2010-10-13 13:31:30 +02:00
Kai Koehne
f5716f05b7 QmlDump: Get right Qt version for .qmlproject
We're using a QObject property to get the Qt Version Id: QmlDumpTool
is in Qt4ProjectManager, which shouldn't have a dependency to QmlProjectManager.

Reviewed-by: Christian Kamm
2010-10-06 10:15:13 +02:00
Kai Koehne
6267671858 QmlProject: Disable debug action if qmlobserver cannot be built
QmlObserver right now requires 4.7.1 minimum. There's no gain in
telling the user that he needs qmlobserver to debug, if it can't be
build with 4.7.0 anyway.

Reviewed-by: Christiaan Janssen
2010-10-05 12:45:10 +02:00
Kai Koehne
0c054bed77 QmlProject: Let user select Qt version to use
Allow the user to choose which Qt version to use for running
a .qmlproject.

Reviewed-by: dt
2010-10-04 16:59:58 +02:00
Lasse Holmstedt
89443cfb1f QML Observer: Complain about not having it if debugging .qmlprojects
Reviewed-by: hjk
2010-09-29 09:39:42 +02:00
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
2010-09-29 09:39:30 +02:00
Kai Koehne
51d51d0228 Fix style issues in QmlProject runtime configuration pane
Reviewed-by: Christiaan Janssen
2010-09-28 15:17:54 +02:00
Tobias Hunger
f06512d5f7 Use ExistingCommand in PathChooser where it makes sense 2010-09-24 16:35:09 +02:00
Leena Miettinen
224b43034c UI text - fix capitalization 2010-09-17 11:14:38 +02:00
Lasse Holmstedt
dca859601f Fix misaligned debugger label in run configuration widgets
It was badly positioned esp. in OS X and Windows.
2010-09-10 17:27:08 +02:00
Kai Koehne
6f11765dae Qml: Allow user to configure port used (all project types)
Reviewed-by: dt
2010-09-03 12:29:41 +02:00
Lasse Holmstedt
8c39471081 Debugger languages are now runconfiguration dependent
There's a UI in qml/customexec/cmake/qmake run configs for choosing the
debugger languages (C++ and QML). The default for all except .qmlproject
is only C++, so default debugging behavior is the same. However, if the
user wants to do simultaneous debugging with two languages, or only
debug QML, they can select the languages from Run Settings and it will
be remembered.

Reviewed-by: hunger
2010-09-01 11:35:36 +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
3b4c322d59 QmlProject: Show effective qmlviewer call in separate row
Don't misuse the input field for a custom qmlviewer path with displaying
the effective qmlviewer used. Previously the effective qmlviewer was
only calculated when the project pane is shown first, and then never
updated.

Reviewed-by: holmstedt
2010-08-20 12:27:12 +02:00
Kai Koehne
2febf2718c QmlProject: Remove debug info from runtime configuration
QmlInspector has been disabled

Reviewed-by: holmstedt
2010-08-20 12:27:01 +02:00
Kai Koehne
5bbb4c6129 QmlProject: Fix memory leak
Remove unneeded widget (has been added unintendedly in 60fffd
2010-08-20 10:50:30 +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
Roberto Raggi
4a9ba8d082 Removed useless test. 2010-07-16 16:50:54 +02:00
Lasse Holmstedt
dad99969ab Fixed OS X qml observer name 2010-07-15 10:13:06 +02:00
Olivier Goffart
9a1d97707a Merge branch 'qmljsinspector'
Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.cpp
	src/plugins/qmljseditor/qmljseditor.h
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/tools/qml/qmlobserver/editor/resizehandleitem.h
2010-07-14 15:41:27 +02:00
Lasse Holmstedt
763d5bdd86 rename qmlviewer to qmlobserver 2010-07-14 15:31:24 +02:00
Lasse Holmstedt
66a008e9de modified qml run config title 2010-07-14 15:30:53 +02:00
dt
7862e31256 Refactor OutputFormatter
Move link handling code to outputwindow from OutputFormatter

Move createOutputFormatter to the RunConfiguration

That makes it easier for Qt4RunConfiguration et all.
This also fixes that each time a runcontrol was rerun a new
OutputFormatter was created without deleting the old one, thus
increasing the memory usage.
2010-07-14 13:01:43 +02:00
Lasse Holmstedt
bb08fb6528 added custom qmlviewer to creator
This qmlviewer will be also the default one when opening qmlproject files
as the runconfiguration was changed too.
2010-07-08 14:00:33 +02:00
Kai Koehne
ef48306ba7 QmlProject: Consistently enable/disable debug & run buttons
The heuristics to find the file to run and the logic that decides
whether the show / debug button is shown weren't in sync. Also, don't
try to run .qmlproject files if open in the editor.

Reviewed-by: Lasse Holmstedt
2010-06-10 10:26:32 +02:00
Kai Koehne
adad842bbe Rename QML Runtime to QML Viewer again in the UI
Latest qt renamed qml executable back to qmlviewer, and also named
the executable again QML Viewer instead of Runtime/Launcher.
2010-05-20 12:00:35 +02:00
Lasse Holmstedt
9c2eb9fe2e QmlInspector: Modifiable properties from inspector property table 2010-04-21 10:32:26 +02:00
Erik Verbruggen
53425816af Moved "Application Output" formatting to a specialized formatter.
By introducing the OutputFormatter, RunControls can influence the formatting
depening on the application started. A nice (and intended) side-effect is that
the QML runtime specific formatting will not interfere anymore with anything
else.
2010-04-19 14:21:48 +02:00
Lasse Holmstedt
6538ca63bc Fixed clone constructor for qml run configuration 2010-04-16 15:56:25 +02:00
Thorbjørn Lindeijer
2ab7d2eafc Some documentation comment formatting and a rename
Renamed RunConfiguration::configurationWidget to
createConfigurationWidget.

Reviewed-by: dt
2010-04-16 13:31:22 +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
Kai Koehne
3d2a83910d QmlProject: Qml runtime command parameter -L has been replaced by -I
See commit c3a54c470 in qt
2010-04-14 15:54:28 +02:00
Lasse Holmstedt
c72043f578 Sorting to QML project file selector, and update when files change
Task-number: BAUHAUS-548
Reviewed-by: kkoehne
2010-04-13 11:08:37 +02:00
Lasse Holmstedt
9606c818b7 Sorting for runnable qml files alphabetically 2010-04-12 17:33:51 +02:00
Kai Koehne
5ade00d9c9 QmlDesigner: Fix handling of multiple arguments to qml runtime
Task-number: QTCREATORBUG-1040
2010-04-06 11:30:56 +02:00
Christian Kamm
a3187addc5 QmlProjectManager: more libraryPaths -> importPaths renames.
See c722282cf3.
2010-03-21 09:36:54 +01:00
Kai Koehne
ee34cd2205 QmlProject: Remove unconditional qdebug 2010-03-10 16:39:15 +01:00
Kai Koehne
1a37b0e762 Rename QML Viewer to QML Runtime 2010-03-10 16:39:15 +01:00
Lasse Holmstedt
e6cb26142b Fixed faulty init of Qml run config 2010-03-09 17:05:11 +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
Lasse Holmstedt
e2cc3c4c8b Fixed localization with qml run configuration
Reviewed-by: dt
2010-03-05 11:38:52 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Lasse Holmstedt
cba54bf47d Disable run controls if no qml file is selected
Task-number: BAUHAUS-396
Reviewed-by: dt
2010-03-05 11:14:13 +01:00
Daniel Molkentin
3d57255925 qml project: it's now qml instead of qmlviewer
Reviewed-By: con
2010-03-02 11:33:44 +01:00
Thomas Hartmann
1f940786fb Merge branch 'qml_renaming'
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
2010-03-01 09:44:00 +01:00
Kai Koehne
37df9fcb78 QmlProjectManager: Remove debugging output 2010-02-28 10:58:10 +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
Tobias Hunger
4cd5cb0eab Save debug server settings in QML RunConfiguration
Reviewed-by: Kai Koehne
2010-02-22 12:24:28 +01:00
Lasse Holmstedt
8605750b5f Added a missing slot implementation for server address change 2010-02-16 17:15:38 +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