Olivier Goffart
896e898369
debugger: comment out the code that runs the qmlviewer from QMLEngine
...
the qmlviewer is currently started from the qmljsinspector.
But this might change in the future
2010-07-08 17:27:23 +02:00
ck
c4e9559c44
Maemo: Remove native separators from where they don't belong.
2010-07-08 17:10:48 +02:00
Olivier Goffart
846a60dfce
Merge branch 'qmljsinspector' of scm.dev.nokia.troll.no:creator/qml-rewriter into qmljsinspector
2010-07-08 17:03:40 +02:00
Kai Koehne
d3c4f329d7
CppEditor: Don't show 'generated' symbols in the outline
...
Don't show e.g. all the methods that are defined by the Q_OBJECT
macro in the outline. We skip these by checking for Symbol->isGenerated
in the two proxy models used.
2010-07-08 17:03:38 +02:00
Lasse Holmstedt
4c1297f397
disabled qt designer
...
this is just so speed up compilation time & have some files
go away which have same names in qml viewer and quickdesigner.
2010-07-08 16:51:36 +02:00
Lasse Holmstedt
6b4ed2145e
setting method bodies for objects
2010-07-08 16:51:25 +02:00
kh1
5265c25b56
The version number is only used for packaging.
...
Disable the spinboxes once we disable packaging.
Reviewed-by: ck
2010-07-08 16:50:06 +02:00
Kai Koehne
82497a9545
CppEditor: Re-use also the code to find the right index
...
Don't calculate the right QModelIndex twice.
2010-07-08 16:19:05 +02:00
Kai Koehne
2ba49e4e72
CppEditor: Reuse OverviewModel from text editor also in the outline pane
...
There's no use synchronizing the same model twice.
2010-07-08 16:19:05 +02:00
Olivier Goffart
905f2e629b
Merge remote branch 'origin/master' into qmljsinspector
...
Conflicts:
src/plugins/qmlinspector/qmlinspector.cpp
2010-07-08 16:13:14 +02:00
Olivier Goffart
95b0641596
QML Debugger: Restore the ability to set breakpoint on all files.
...
The agent is only attached when creator request it. But this may occurs
After some scripts have been initialized. Which mean we do not get the
scriptLoad call.
2010-07-08 16:01:29 +02:00
Roberto Raggi
2785f01360
Install the QMLViewer in the application directory.
2010-07-08 15:55:36 +02:00
ck
1430358d52
Maemo: Give meaningful names to run configurations.
...
Reviewed-by: kh1
2010-07-08 15:47:14 +02:00
Roberto Raggi
1b5dd002c4
Compile with qt-qml.
2010-07-08 15:44:35 +02:00
dt
d5932f0cc7
Active project not beeing bold after switching navigation views
...
Task-Nr: QTCREATORBUG-1741
2010-07-08 15:37:56 +02:00
Friedemann Kleint
c96c375a57
Windows compile fix.
2010-07-08 15:23:22 +02:00
Tobias Hunger
fa35bbc5ef
Build fix on windows
2010-07-08 14:53:18 +02:00
Roberto Raggi
d70fe1eb61
Introduced QmlJS::LookupContext.
2010-07-08 14:50:25 +02:00
Christian Kamm
a2ae7eae4c
Qml scanner: Don't emit token for empty line in multi-line comment.
...
Done-with: Thomas Hartmann
2010-07-08 14:32:02 +02:00
Olivier Goffart
1d66829941
Remove useless debug
2010-07-08 14:27:45 +02:00
Olivier Goffart
1140de4977
qmlviewer: Add a javascript debugger.
...
The idea is to only enable it if it is run with -debugger, but for now
it is always enabled for simplicity.
This let you debug QML Javascript from creator
2010-07-08 14:23:33 +02:00
Christian Kamm
db9b630b48
Qml scanner: Fix begin location of comment tokens in multiline comments.
...
Done-with: Thomas Hartmann
Reviewed-by: Roberto Raggi
2010-07-08 14:20:30 +02:00
Kai Koehne
02923cf258
Support Outline sidebar for QML files
2010-07-08 14:02:51 +02:00
Kai Koehne
1541dec6f3
Add Icons provider to QmlJS library
...
Add an Icons class to QmlJS along the Icons class in the C++ support.
This will be used in the QmlJS Outline.
2010-07-08 14:02:51 +02:00
Kai Koehne
1fff761d57
Support Outline sidebar for C++ files
2010-07-08 14:02:51 +02:00
Kai Koehne
5439ce976e
Add new Outline sidebar pane
...
Adds a generic Outline pane to the sidebar. The CppEditor & QmlJSEditor
plugins will implement the IOutlineWidget/IOutlineWidgetFactory interface to
provide views specific to C++/Qml/JS documents.
Reviewed-by: con
2010-07-08 14:02:51 +02:00
Kai Koehne
ebe388ee92
QmlJSEditor: Signal that new semanticInfo is available
...
Will be used in QmlJSOutline.
2010-07-08 14:02:51 +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
ck
5649327a8d
Maemo: Add reload functionality to project file wrapper.
2010-07-08 13:53:04 +02:00
ck
fc17ac2f9e
Maemo: Make deployables widget read-only.
...
We don't have the API to sensibly support writing tot he project file.
Reviewed-by: kh1
2010-07-08 13:53:04 +02:00
hjk
7d2f56d3df
debugger: rename CdbDebugEngine into CdbEngine
...
Fits better into the scheme and makes grep^H^H^H^H Ctrl-F-ing easier.
2010-07-08 13:51:29 +02:00
Lasse Holmstedt
aa4f9725eb
removed undefined slot
2010-07-08 13:48:27 +02:00
hjk
f8d96f09a6
debugger: rename startDebugger() to startEngine()
2010-07-08 13:48:09 +02:00
Tobias Hunger
3145b27061
Make detection of .user-file copying more robust
...
* Create and store a UUID when starting the projectexplorer plugin
* Check for this UUID when reading .user files:
* Hostnames may change due to moving between dhcp networks, etc.
* MAC addresses do not change when booting different OSes
* Put UUID into .user file when writting it (instead of hostname).
Task-number: QTCREATORBUG-1820
2010-07-08 13:45:24 +02:00
hjk
eab55aac6b
debugger: move state change to EngineStarting into the base class
2010-07-08 13:28:51 +02:00
Christian Kamm
c8fae11222
C++ indenter: Fix for extending if conditions.
...
Task-number: QTCREATORBUG-1825
2010-07-08 13:08:03 +02:00
hjk
aaf2912857
debugger: make lupdate happy
2010-07-08 12:46:25 +02:00
hjk
405f340e2b
debugger: streamline communication between GdbEngine and the adapters
2010-07-08 12:41:53 +02:00
hjk
2385e15b2d
debugger: merge 'AdapterStarting' into 'EngineStarting' state
2010-07-08 12:41:53 +02:00
Friedemann Kleint
76e85abf2c
Debugger: Fix some tr-errors.
2010-07-08 12:40:38 +02:00
Tobias Hunger
74861fa161
Add some missign Q_OBJECT macros
2010-07-08 12:36:43 +02:00
Christian Kamm
574afeb551
C++ indenter: Build fix for windows.
...
Done-with: Tobias Hunger
2010-07-08 12:31:52 +02:00
Lasse Holmstedt
7e67880ef7
connected reloading signals
2010-07-08 12:30:08 +02:00
ck
9d7fc860bf
Maemo: Add watcher for project files.
...
Reviewed-by: kh1
2010-07-08 12:19:02 +02:00
ck
70e801bb09
Maemo: Handle missing specification for remote executable.
...
Reviewed-by: kh1
2010-07-08 12:19:02 +02:00
Friedemann Kleint
05c554020a
Template-CustomWizard: Translate QComboBox items.
...
For 280541aec9 .
2010-07-08 12:05:49 +02:00
Friedemann Kleint
280541aec9
Template-CustomWizard: Make QComboBox parameters more flexible.
...
Separate value and display text for the entries, use
in ListModel example.
Rubber-stamped-by: aportale <alessandro.portale@trolltech.com >
2010-07-08 11:46:11 +02:00
hjk
cdf7dbeada
debugger: start refactoring of state transitions
...
This updates the state diagram in debuggerplugin.cpp and
renames AdapterStart{Fail}ed to EngineStart{Fail}ed.
2010-07-08 11:45:51 +02:00
Lasse Holmstedt
9a81759101
manually applied changes from qmlinspector to qmljsinspector
2010-07-08 11:36:26 +02:00
Tobias Hunger
8d7ee24a15
Fix typo
2010-07-08 11:14:23 +02:00