feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
15,717 Commits 108 Branches 368 Tags
01b51fb6da74a9671bd370481850d9067f3979c3
Commit Graph

195 Commits

Author SHA1 Message Date
hjk
4f23545259 qmljsinspector: remove unused global variable 2010-12-03 12:39:00 +01:00
hjk
2ccad7afb8 qmljsinspector: code cosmetics 2010-12-03 12:36:32 +01:00
hjk
a7945715a1 debugger: compile hot fix 2010-12-03 12:30:27 +01:00
hjk
4c5f78de18 qmljsinspector: remove some dependencies on debugger internals 2010-12-03 11:54:41 +01:00
hjk
54ccfe99a8 qmljsinspector: no need to store the dock widget explicitly 2010-12-03 11:45:47 +01:00
Kai Koehne
5cd1cd10c9 QmlJsInspector: Fix crash on plugin initialization 
Delay the setup of the UI until the Debug mode is activated. This is
required by the Debugger now setting up most of it's UI in
extensionsInitialized ...
 2010-12-03 10:40:08 +01:00
Kai Koehne
f179c9362f QmlJsInspector: Fix typo in method name 2010-12-03 10:40:01 +01:00
Kai Koehne
46a30158df QmlJSInspector: Re-enable again by default 
Don't mark plugin as experimental. Probably got introduced by some
merge.
 2010-12-03 10:21:20 +01:00
Bill King
1bc12b09cc debugger: compile fix 2010-12-03 10:07:09 +10:00
hjk
a77353b414 debugger: move DebuggerMainWindow to debuggermainwindow.{h,cpp} 2010-12-02 17:43:14 +01:00
hjk
05f6151d33 debugger: merger DebuggerMainWindow and DebuggerUISwitcher 2010-12-02 17:34:04 +01:00
Kai Koehne
1e86df7191 Utils: New class to map installed file path to source path 
FileInProjectFinder implements an heuristic to find the likely source
file for an aribrary file path, e.g. in the shadow build folder or
on the device. This is useful especially for .qml files, which are
executed at runtime.

Reviewed-by: con
 2010-12-01 16:54:32 +01:00
Kai Koehne
5c67e10253 QmlObserver: Apply changes to file also if not in Debug mode 
Also apply changes to the .qml file in e.g. the Design mode to
the running application.
 2010-11-24 13:42:54 +01:00
Kai Koehne
d2ed221b1b QmlObserver: Add 'show app on top' switch to creator + qmlobserver 
This is convenient especially in the observer mode.

Reviewed-by: Christiaan Janssen
 2010-11-23 16:24:23 +01:00
Kai Koehne
72af7899f2 QmlJsInspector: Code cleanup 2010-11-23 16:24:23 +01:00
Kai Koehne
a720abb733 QmlJSInspector: Code cleanup 2010-11-23 16:24:23 +01:00
Kai Koehne
c33348a49f Observer mode: Fix automatic selection of all instances 
If the user clicks on an instance of an element in the running app
while in server mode, the cursor selection is automatically updated.
However, the change of the cursor then leads to all the other
instances of the element at the cursor position being selected too.

Prevent this 'call back' in the QmlInspector by checking whether one
of the newly selected items is the one just selected.

Simpler mechanisms (like a sequential blocking of updates) don't
work because the call back happens through a QTimer.

Task-number: QTCREATORBUG-2366
 2010-11-12 15:08:09 +01:00
Kai Koehne
7e50ebcfba QmlJSInspector: API cleanup 
Rename setSelectedItemsByObjectReference slot to gotoObjectDefinition
 2010-11-12 15:08:09 +01:00
Kai Koehne
b9cb5b973b QmlJSInspector: Don't send update if selection hasn't changed 2010-11-12 15:08:09 +01:00
Kai Koehne
c43496d035 QmlJSInspector: API cleanup 
Give m_client, m_designClient member variables more descriptive names.
 2010-11-12 15:08:09 +01:00
Kai Koehne
1cc61e06ea QmlJSInspector: API cleanup 
Simplify method names.
 2010-11-12 15:08:09 +01:00
Kai Koehne
59060fb225 QmlJSObserver: API cleanup 
Change signature of setSelectedItemsByObjectId to match the one from
signal currentObjectsChanged.
 2010-11-12 15:08:09 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
hjk
2161e0f6d9 debugger: refactoring of the plugin interface 
There's  some 'external' and some 'internal' part now. Other plugins
are only supposed the external interface.
 2010-11-10 12:08:23 +01:00
Kai Koehne
eac940cd01 QmlInspector: Fix mapping of file names to source dir on Mac 
Qml Applications by default copy the qml files into XX.app/Contents/Resources in
the shadow build directory. Take this into account when trying to find the files in the source directory.

Reviewed-by: Alessandro Portale
 2010-11-05 16:15:53 +01:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build 
... instead of running a sed script over a lot of files on each
version increment.
 2010-11-03 17:47:41 +01:00
Oswald Buddenhagen
e160f071ce centralize addition of pluginspecs to OTHER_FILES 2010-11-03 17:47:41 +01:00
Tobias Hunger
af0413ec1e Add Q_OBJECT macros 
Krazy complained about missing Q_OBJECT macros. Fix them.
 2010-11-03 12:45:32 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
con
d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
Friedemann Kleint
77008bc45f Exported Header cleanup: QmlJSEditor 
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2010-11-02 11:10:27 +01:00
Oswald Buddenhagen
35bb61590d Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
 2010-10-25 11:27:30 +02:00
Kai Koehne
aa0e82e6c8 QmlJS: Fix crash in debugger tooltips 
Check that the node under cursor is indeed a UiObjectMember

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-2760
 2010-10-19 20:02:32 +02:00
Oswald Buddenhagen
dfee3388af Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
 2010-10-18 20:59:12 +02:00
Kai Koehne
542796523d QmlJSDebugger: Disable Observer pane after debugging ends 
At the time setupToolbar is called in the shutdown process the
connection still exists. Instead just use the parameter.

Task-number: QTCREATORBUG-2693
Reviewed-by: Christiaan Janssen
 2010-10-14 14:45:43 +02:00
Christian Kamm
b78c1ef6da Merge remote branch 'origin/2.1' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp
 2010-10-11 14:16:33 +02:00
Kai Koehne
fdee97530e QmlInspector: Remove "Reload" button 
It only works together with qmlobserver. Making it disabled for .pro
file based projects would require some infrastructure.

Reviewed-by: Christiaan Janssen
 2010-10-08 15:51:56 +02:00
Kai Koehne
e81fa24807 QmlInspector: Rearrange icons in the QmlObserver toolbar 
Separate QmlObserver button + submodes from the general Preview &
Reload functionality.

Task-number: QTCREATORBUG-2163
Reviewed-by: Christiaan Janssen
 2010-10-08 15:51:56 +02:00
Kai Koehne
d1175f3ea2 QmlJSObserver: Fix crash when adding an element to some .qml files 
Make sure that the 'artifical' URL of the item created actually is
absolute (starts with a file:///). Otherwise an Assert will be hit
when the imports include e.g. a .js file, and the Engine tries to
load it.

Task-number: QTCREATORBUG-2644
Reviewed-by: Olivier Goffart
 2010-10-08 15:51:56 +02:00
Kai Koehne
e0b11d4374 QmlJSInspector: Guard qDebug output 2010-10-08 15:51:55 +02:00
Kai Koehne
8049a0276d QmlJSInspector: Fix disconnect() warnings on users app shutdown 
Don't try to disconnect from the proxy if you haven't been connected
before, e.g. because the QmlJSObserverService is missing.

Reviewed-by: Christiaan Janssen
 2010-10-08 15:51:55 +02:00
Kai Koehne
a60960cfbc QmlJSInspector: Enable plugin by default 
We disabled it because it should be considered experimental ...
but this creates problems with the debugger setup (Observer pane
doesn't show up even if the plugin is activated).

Carsten Owerfeldt agreed with this.
 2010-10-08 15:51:55 +02:00
Kai Koehne
5f9b05762e QmlJSObserver: Add debugging output to client 2010-10-08 14:49:29 +02:00
hjk
880312c549 version bump: 2.0.92 -> 2.0.93 2010-10-08 13:50:04 +02:00
hjk
4f05687ed0 version bump: 2.0.91 -> 2.0.92 2010-10-07 15:05:56 +02:00
Olivier Goffart
6d73634429 Fix typo in a comment 2010-10-07 11:25:53 +02:00
dt
6b6d9871b8 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
 2010-10-04 16:07:46 +02:00
Kai Koehne
ed6f28522d QmlInspector: Fix regression in live preview 
ClientProxy::isEnabled() now only returns true when the server plugins
are available too. Wait until then before using it to initialize
the livepreview objects.

Reviewed-by: Lasse Holmstedt
 2010-10-04 13:24:32 +02:00
Kai Koehne
5a6faea21f QmlJsInspector: Remove unconditional qDebug 2010-10-01 17:42:13 +02:00
Kai Koehne
4cbbe9ca7b QmlInspector: Fix regression making the observer unusable 
We've to wait with reloadEngines until the services are actually
enabled.
 2010-10-01 17:34:06 +02:00