Thorbjørn Lindeijer
173cdff56c
Merge branch '2.0'
...
Conflicts:
src/plugins/cppeditor/cppquickfix.cpp
src/plugins/mercurial/mercurialjobrunner.cpp
src/plugins/subversion/subversionplugin.cpp
2010-06-15 13:22:33 +02:00
Thorbjørn Lindeijer
a6e5298591
Fixed handling of text wrapping and a text layout corner case
...
Due to using QTextCursor::columnNumber() instead of
QTextCursor::positionInBlock(), a lot of code would not work correctly
when used with wrapped lines.
In addition, there was an issue with columnNumber() returning 0 right
after inserting a character before the last character of a line.
Reviewed-by: mae
2010-06-15 12:25:01 +02:00
Oswald Buddenhagen
b3a1e36cc4
fix qmldump compile with external QT_PRIVATE_HEADERS
2010-06-14 12:56:01 +02:00
hjk
97edcb7977
debugger: start 'runcontrol-ification' of the debugger plugin.
...
This replaces most uses of DebuggerStartParameters by DebuggerRunControl
which is a simple RunControl with a DebuggerStartParameters member.
Plan is to move all global state to the run controls, and possibly
introduce specialized ones for core debugging etc.
2010-06-14 10:45:11 +02:00
con
2e10016210
Version update to match the planned version naming.
2010-06-11 16:41:11 +02:00
con
9250d0007d
Version update to match the planned version naming.
2010-06-11 16:37:10 +02:00
Roberto Raggi
726c3345c4
Moved qmljsmodelmanagerinterface.h
2010-06-10 11:59:27 +02:00
Lasse Holmstedt
3b3df8f61b
fixed qml inspector due to QMLJSEditor API change
2010-06-08 11:50:59 +02:00
con
d326c16747
Version bump.
2010-06-07 13:45:49 +02:00
Lasse Holmstedt
b9d8db2444
Fixed nonsensical context menu entries appearing in Qml inspector
2010-05-04 10:07:12 +02:00
con
84d9b647ee
Version bump.
2010-04-30 11:58:05 +02:00
Lasse Holmstedt
43b9d1aad1
Fixed strings in qmlinspector and shutdown() issues
2010-04-29 09:09:35 +02:00
con
ca14299790
Rename IPlugin::shutdown --> IPlugin::aboutToShutdown
...
Discussed-with: hjk
2010-04-28 17:32:01 +02:00
Lasse Holmstedt
a3aa879827
Moved plugin deletion code from shutdown() to destructor
...
Task-number: QTCREATORBUG-1288
2010-04-28 11:19:08 +02:00
Lasse Holmstedt
4d0ac7c77e
qml inspector now shows correct categories for custom properties
...
Also, a class name is added in qmjs::bind so that we have a class name
for custom properties defined inside a component.
2010-04-23 09:58:29 +02:00
Lasse Holmstedt
d6636e4180
Debugger mode for simultaneous QML and C++ debugging (with plugins)
...
If you have plugins that extend qml, you probably want to debug them
too. This is now possible with the "Start debugging QML and C++
Simultaneously" debug menu entry. Just select a QML project which uses
c++ plugins and start debugging in this mode.
2010-04-23 09:58:28 +02:00
Lasse Holmstedt
473a8e5d28
Categories and saving of settings in qml inspector
2010-04-21 10:32:26 +02:00
Lasse Holmstedt
9c2eb9fe2e
QmlInspector: Modifiable properties from inspector property table
2010-04-21 10:32:26 +02:00
Thorbjørn Lindeijer
0462d34377
Fixed compile (unimplemented slot)
2010-04-16 17:35:29 +02:00
Lasse Holmstedt
9b060071d9
UI improvements and functionality fixes to qml inspector
...
now you can modify expression values after you set a watch on them.
doesn't seem to work yet for all cases, but there must be some issues
within the qml debug server holding things back.
2010-04-16 15:56:24 +02:00
con
6c492dac4d
Remove some focus rects on the Mac that don't belong there.
2010-04-16 11:40:25 +02:00
Lasse Holmstedt
ae8a8a5c84
UI fixes to QML inspector
2010-04-16 10:22:50 +02:00
Lasse Holmstedt
5921289580
Disabled frame rate dock widget for QML inspector entirely
2010-04-16 10:22:50 +02:00
ck
3a9e75302f
QML: Fix compilation with namespaced Qt.
2010-04-15 15:56:49 +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
Lasse Holmstedt
656899842c
restored commented-out code
2010-04-13 15:48:01 +02:00
Lasse Holmstedt
af3f10dfdd
Fixed auto-switching issues with QML inspector and c++ debugger
...
Reviewed-by: hjk
2010-04-13 15:16:03 +02:00
Kai Koehne
e7a9619c2f
QmlDesigner: Bump version number from 4.6 to 4.7 in qml files
...
Reviewed-by: Thomas Hartmann
2010-04-13 15:15:15 +02:00
Jens Bache-Wiig
a2a68fd4dc
Improved some icons and removed unused or redundant ones
...
Reviewed-by: Daniel Molkentin
2010-04-09 17:43:22 +02:00
Christiaan Janssen
b1b493ce41
QmlInspector: Anonymous items' types displayed with special characters in object tree
2010-04-09 16:04:52 +02:00
Christiaan Janssen
7f3649be49
QmlInspector: commented out dump of the item tree at every execution
2010-04-09 16:04:52 +02:00
Christiaan Janssen
a47b424e4f
QmlInspector: corrected showing of items' id when added to the watch list
2010-04-09 16:04:52 +02:00
Christiaan Janssen
969fc516db
QmlInspector: Object tree shows item's ID if available
2010-04-09 15:11:35 +02:00
con
5892049d65
Remove the unused complete this shortcut registered by the qml inspector.
...
It was conflicting with the normal completion shortcut, and it shouldn't
register a new command anyhow.
Reviewed-by: Lasse Holmstedt
2010-04-08 15:22:40 +02:00
Friedemann Kleint
8d384fc6ad
Fix QSettings keys of FancyMainWindow in QtCreator.ini.
...
Do not use localized Window Titles. Use objectName
or default to dockWidget<n>".
Task-number: QTCREATORBUG-1059
2010-04-06 11:23:11 +02:00
con
ded5ed975a
Version bump
2010-03-31 18:06:02 +02:00
Lasse Holmstedt
62d1d6bf73
Fixed crash with debugger when qml inspector is not enabled as plugin
2010-03-26 16:43:39 +01:00
Friedemann Kleint
dd3bf0c653
tr()-Fixes in QmlDesigner.
2010-03-24 12:54:08 +01:00
Lasse Holmstedt
0b010954ad
Help for qml inspector (with F1), namespace fixes
2010-03-22 11:43:54 +01:00
Thorbjørn Lindeijer
909285731f
Revert "No need to export these constants"
...
This reverts commit a61728f6ee .
This was a non-change, since const int is implicitly static in C++.
2010-03-19 15:42:23 +01:00
Lasse Holmstedt
641da7c2cf
Fixed whitespace in code
2010-03-19 14:55:03 +01:00
Thorbjørn Lindeijer
a61728f6ee
No need to export these constants
2010-03-19 14:01:58 +01:00
Lasse Holmstedt
d5bdad2269
context-based hiding/showing of debug menu entries
...
the previous implementation relied on poking around with setVisible
of the menu actions. Now, command attribute CA_Hide is used instead for
the necessary entries.
Reviewed-by: hjk
2010-03-19 13:59:57 +01:00
Lasse Holmstedt
8c83a9d088
Added tooltips to qml inspector
2010-03-19 13:59:57 +01:00
Lasse Holmstedt
ce57387f89
Fixed jumping to edit/design mode when debugging qml files
2010-03-19 13:59:57 +01:00
hjk
edaed0b943
cosmetics
2010-03-18 16:48:16 +01:00
hjk
a793f7c44e
qmlinspector: compile fix with namespaces
2010-03-18 16:48:15 +01:00
Lasse Holmstedt
ff30737318
UI fixes to qml inspector
2010-03-18 14:48:31 +01:00
Lasse Holmstedt
cf5bd6de4e
Made qml inspector look nicer and clear its contents upon close
2010-03-18 14:48:30 +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