Commit Graph

69 Commits

Author SHA1 Message Date
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
Bea Lam
7fa633259b Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 2010-01-12 10:53:20 +10:00
Bea Lam
5a1f825cff Fix bug where the qmlinspector tries to connect to the debug
server before it has started.
2010-01-12 10:50:37 +10:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers
Reviewed-by: thorbjorn
2010-01-11 10:26:12 +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
Daniel Molkentin
39e4b11277 Fix GCC warnings. 2010-01-04 15:34:38 +01:00
Bea Lam
200a03ed20 Fix QmlInspector to work properly now that QmlProjectManager
no longer uses LocalAppRunConfiguration. QmlInspector now uses
the qmlviewer started by QmlProjectManager instead of starting
its own, and clicking the Start Debug button within a QML
project will switch to QML Inspect mode and start the inspector.
2009-12-18 15:32:36 +10:00
Kai Koehne
7900ec6da2 Enable starting a qmlproject via Debug
This will right now wait for a qmldebugger connection.
2009-12-17 09:54:16 +01:00
Friedemann Kleint
895a3e21f3 Compile Windows. 2009-12-17 08:46:22 +01:00
Kai Koehne
80963107c6 Fix various crashes for QmlProject
QmlProject used LocalApplicationRunCOnfiguration, but didn't provide
e.g. an associated BuildConfiguration. Fix this by implementing it's
own QmlRunControlFactory, QmlRunControl.
2009-12-16 16:40:58 +01:00
dt
a312206306 Move most of the BuildConfiguration specific functions
Note: I didn't fix all the connects and there are a few missing things.
This compiles, more work is coming.
2009-11-30 15:24:31 +01:00
dt
0d162be22f Make BuildSteps one instance per BuildConfiguration
Enables users to change which buildsteps get run per buildconfiguration.
Some further tweaks are probably necessary. This is a rather big
change, though it should work. :)
2009-11-19 16:36:48 +01:00
dt
10a0647ddf Remove QSharedPointer<> for RunConfiguration 2009-11-19 16:35:18 +01:00
Kai Koehne
a44e33ac93 Let one 'reset' the qmlviewer path in the config page by
just emptying it.

Discussed with Nigel.
2009-11-03 14:12:10 +01:00
Kai Koehne
4c85511d55 Search qmlviewer binary also in creator/bin 2009-10-23 11:33:26 +02:00
Erik Verbruggen
fd6e18584a Added fall-back for the QML viewer to first check if there is one bundled with Qt Creator. 2009-10-09 10:39:44 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
Friedemann Kleint
74a3828f19 Purge out include files in exported headers 2009-10-01 16:38:08 +02:00
con
acbd4513e3 Changing string based api to BuildConfiguration based api.
Builds, but I'm pretty sure it doesn't *work* :)
2009-10-01 10:05:05 +02:00
Erik Verbruggen
fcf19f1a1b Renamed the DUI editor to QML editor. 2009-09-30 17:43:21 +02:00
Kai Koehne
e4a3ad2108 Add option to specify qmlviewer command line arguments 2009-09-30 11:37:17 +02:00
Friedemann Kleint
ad294f8467 Project explorer: Make public headers compile with NO_CAST_FROM_ASCII
.. and purge unneeded includes.
2009-09-29 11:39:55 +02: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
dt
fba7d76936 Canceling the wizard for a new cmake build configuration still created.
Made virtual newBuildConfiguration return a bool
2009-09-23 15:00:02 +02:00
Erik Verbruggen
1b4d1f1fd4 Suppress warning dialog when the QML Viewer executable cannot be found. 2009-09-08 12:43:14 +02:00
Erik Verbruggen
cac5663a4f Modified the QML project to notify the DUI model manager when a file is added to the project. 2009-09-04 17:54:38 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
dbe5a6f34b Rework the project settings.
This has still a few missing things, but this enough to start getting
some feedback. Missing are non qt projects, a solution for the
runconfiguration, a missing black line between the treeview on top and
the project settings at the bottom. Some flickering with removing/adding
widgets to the QScrollArea and not showing the expanded widget if the
Details button is right at the bottom.
2009-08-06 15:31:32 +02:00
dt
54bbcc4a7c Mention possible locations of the debugging helper in the error dialog
Requires a lot of trivial forwarding.
2009-07-15 17:41:45 +02:00