feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
89,589 Commits 108 Branches 368 Tags
afea900b966d202435292cb15101ee71b9299f19
Commit Graph

72811 Commits

Author SHA1 Message Date
con
733fa8f781 Mixing of namespace and file name. 
Reviewed-by: Thorbjørn
 2010-01-13 14:34:22 +01:00
ck
309fe426b0 Make Botan and Ne7 libs compile on Mac. 2010-01-13 14:31:23 +01:00
Marco Bubke
b90cb496fc Set the width or height of the root item to 100 if there is no width or 
height

Task-number: BAUHAUS-291
 2010-01-13 14:23:31 +01:00
Marco Bubke
790e987f1f Remove formeditoritems for removed nodeabstractproperties 2010-01-13 14:23:31 +01:00
Friedemann Kleint
c84e898f08 Text editor: Fix settings groups. 
Remove they newly introduced category sortkey.
 2010-01-13 14:21:39 +01:00
Roberto Raggi
eaecfb7e06 Fixed auto-quote completion at the end of unfinished string literals. 2010-01-13 13:54:38 +01:00
Kai Koehne
c979e3d18b Add dependency from qmlinspector to qmlprojectmanager 
Otherwise parallel builds might fail
 2010-01-13 12:19:19 +01:00
Kai Koehne
84c30ea99e Let the DesignMode recover when the qml contains an error on first load 
If the qml contains an error on frist call of
DesignDocumentController::loadMaster, we did not wire up the components
to the model. If the user then fixed the qml, the Design mode widgets
were 'enabled', but didn't contain any meaningful input.

Fixed by always wiring up the components. Unfortunately this shows the
'default' model with just a Rectangle.
 2010-01-13 11:53:42 +01:00
Kai Koehne
e929a40108 Code indentation fixes 2010-01-13 11:53:42 +01:00
con
232db42069 Fixes: Not able to set breakpoints in running application. 
Regression introduced by the gdb startup speedup.

Reviewed-by: hjk
 2010-01-13 11:04:08 +01:00
ck
e78763bb04 Maemo: Introduce automatic cleanup for another pointer. 2010-01-13 10:45:26 +01:00
Friedemann Kleint
55b4e6d383 Debugger/CDB: Increase limits on string size in watch data. 
Introduce truncation in item view instead (full value visible in
ToolTip).

Reviewed-by: hjk
Task-number: QTCREATORBUG-305
 2010-01-13 10:36:37 +01:00
Kai Koehne
f196700ee3 Fix compilation with msvc 2010-01-13 08:43:35 +01:00
Bea Lam
c9da13eb21 Use the QmlProject configuration to set the debug server port. 2010-01-13 11:45:51 +10:00
con
7be7c52a69 Fix use of dumper library. 
Not assigning a value to a variable will not put the variable in the
right state...
 2010-01-12 18:41:21 +01:00
Roberto Raggi
be127fa090 Added the keyword `readonly' 2010-01-12 18:13:19 +01:00
con
46261d8071 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 2010-01-12 18:02:40 +01:00
con
7199223a6e Merge remote branch 'origin/1.3' 
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.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/cppeditor/cppeditor.cpp
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/gdb/gdbengine.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/locator/Locator.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmleditor/QmlEditor.pluginspec
	src/plugins/qmleditor/idcollector.cpp
	src/plugins/qmleditor/idcollector.h
	src/plugins/qmleditor/parser/qmljsglobal_p.h
	src/plugins/qmleditor/qmlcodecompletion.cpp
	src/plugins/qmleditor/qmlcodeformatter.cpp
	src/plugins/qmleditor/qmlcodeformatter.h
	src/plugins/qmleditor/qmlexpressionundercursor.cpp
	src/plugins/qmleditor/qmllookupcontext.cpp
	src/plugins/qmleditor/qmlresolveexpression.cpp
	src/plugins/qmleditor/qmlsymbol.cpp
	src/plugins/qmleditor/qmlsymbol.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	src/shared/qml/parser/qmljsast.cpp
	src/shared/qml/parser/qmljsast_p.h
	src/shared/qml/parser/qmljsastfwd_p.h
	src/shared/qml/parser/qmljsastvisitor.cpp
	src/shared/qml/parser/qmljsastvisitor_p.h
	src/shared/qml/parser/qmljsengine_p.cpp
	src/shared/qml/parser/qmljsengine_p.h
	src/shared/qml/parser/qmljsgrammar.cpp
	src/shared/qml/parser/qmljsgrammar_p.h
	src/shared/qml/parser/qmljslexer.cpp
	src/shared/qml/parser/qmljslexer_p.h
	src/shared/qml/parser/qmljsmemorypool_p.h
	src/shared/qml/parser/qmljsnodepool_p.h
	src/shared/qml/parser/qmljsparser.cpp
	src/shared/qml/parser/qmljsparser_p.h
 2010-01-12 18:02:04 +01:00
Roberto Raggi
27d2a129c2 New smart indenter for QML files. 2010-01-12 18:02:02 +01:00
kh1
126b3de16c Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2010-01-12 17:34:23 +01:00
kh1
71b3985cf6 Build fix for Linux and Mac. 2010-01-12 17:33:16 +01:00
dt
b560e24034 Fix that changing qmake arguments did not update the import label 
Task-Nr: QTCREATOR-269
 2010-01-12 17:21:20 +01:00
Thomas Hartmann
45c605217d Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2010-01-12 17:13:48 +01:00
Thomas Hartmann
94066044b8 Qml Designer.propertyEditor: fix css warning 2010-01-12 17:13:37 +01:00
ck
b7abc03ed0 Maemo: Fix race condition in SSH output reader. 2010-01-12 17:05:56 +01:00
kh1
e4024d228c Fix timeout bug on windows. 
Sleep() is taking milliseconds instead of microseconds.
 2010-01-12 17:01:06 +01:00
Kai Koehne
7f7e9d8640 Make QmlProject & QmlRunConfiguration exported classes 
Will be used in QmLInspector plugin.
 2010-01-12 16:57:33 +01:00
con
e28968bf39 Also remove tokens that we consider "lost" from the list. 
Reviewed-by: hjk
 2010-01-12 16:54:00 +01:00
Friedemann Kleint
d5271a086d VCS[hg, git]: Add support for repository creation. 
Add repository creation operation to IVersionControl, implement for hg
and git, add convenience slot with prompts to VCSBasePlugin.
Add respective menu options and make menus are visible in case no VCS is
active.
Change project wizards extension page to list VCS that are capable of
repository creation in a QComboBox in case the directory is not managed
by another VCS (in which case it lists that one for operation 'add').
On that occasion, polish the Project selection to use a QComboBox as
well and add some smartness to find the most suitable project to add via
path matching.
 2010-01-12 16:45:21 +01:00
con
cdf06a4b3e Remove debug output. 
Reviewed-by: hjk
 2010-01-12 16:23:05 +01:00
Oswald Buddenhagen
5ab250fe57 purge ProEditorModel and ProCommandManager 
they were remnants of the pro editor, which was removed long time ago.
they were still used for automatic editing of pro files, but were
totally overengineered for that purpose (removed 1300 LOC, added 40).
 2010-01-12 16:08:37 +01:00
Roberto Raggi
547912af2a Speed up contextAllowsAutoParentheses(). 
Look at the token under cursor only if the current character is a brace or a quote.
 2010-01-12 16:00:39 +01:00
dt
e3188417c3 Don't silently reset the qt version if it has become invalid 
Instead note that it is invalid if trying to build and on the projects
mode pane.

Task-Nr: QTCREATORBUG-459
 2010-01-12 15:51:11 +01:00
Christiaan Janssen
b407810be6 QmlDesigner.statesEditor: Implementing some missing virtual methods of the View 2010-01-12 15:50:12 +01:00
Marco Bubke
590adf327e Only paint a valid item 2010-01-12 15:30:09 +01:00
Kai Koehne
29b2a5df27 Don't allow users to type into right area in Navigator (QmlDesigner) 
Do not allow users to edit the field right beside the visible checkbox.
 2010-01-12 15:28:36 +01:00
Kai Koehne
d3cccf2db8 Fix crash in QmlDesigner navigator 
Happened when trying to reparent a node to one of it's children.
 2010-01-12 15:28:36 +01:00
kh1
fe4e5117e1 Compile and link on windows. 2010-01-12 15:22:30 +01:00
con
ff066d5e76 Fixes: Missing locals & watchers when debugging on Snow Leopard 
Task-number: QTCREATORBUG-436
Reviewed-by: hjk
 2010-01-12 15:22:02 +01:00
Marco Bubke
e9ed2a4e51 Fix selection if the move mode is active 2010-01-12 15:14:42 +01:00
Marco Bubke
3303e0bbd7 Change timing of the selection 
Task-number:   BAUHAUS-276
 2010-01-12 15:14:42 +01:00
Marco Bubke
cbf3b665bd Remove qDebug 2010-01-12 15:14:42 +01:00
con
77b3bf4d7b debugger: fix timeout message. 
(cherry picked from commit 9ee71d7da9)

Conflicts:

	src/plugins/debugger/gdb/gdbengine.cpp
 2010-01-12 15:13:36 +01:00
ck
1b1b76ee70 Maemo: Get rid of MSVC compiler warning. 2010-01-12 14:58:48 +01:00
Roberto Raggi
58f8f7b725 Added auto-brace matching for JavaScript. 2010-01-12 14:46:11 +01:00
Roberto Raggi
ba55644de3 Added support for quotes 2010-01-12 14:46:11 +01:00
Roberto Raggi
84e6cfcd52 Look at the token under cursor when checking if the context allows auto parentheses. 2010-01-12 14:46:11 +01:00
Roberto Raggi
1989061231 Initial support of auto-brace completion in QML 2010-01-12 14:46:10 +01:00
Erik Verbruggen
178d4c2977 Fixed icc warning. 2010-01-12 14:45:06 +01:00
hjk
9ee71d7da9 debugger: fix timeout message. 2010-01-12 14:31:17 +01:00