feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
12,479 Commits 108 Branches 368 Tags
b76cf034dea05a362beb3366760f77a38dcb541f
Commit Graph

12479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ck
b76cf034de Add Maemo support to QML standalone application wizard. 
Reviewed-by: Alessandro Portale
 2010-07-28 12:48:37 +02:00
ck
60f68080ff QML standalone application wizard: Un-eval project file template. 
Reviewed-by: Oswald Buddenhagen
 2010-07-28 12:48:37 +02:00
Christian Kamm
27026af2e3 C++ indenter: Fix indent of block statements in substatement blocks. 
Task-number: QTCREATORBUG-1919
 2010-07-28 12:39:27 +02:00
Erik Verbruggen
63f7abb03c Corrected a fixme-comment. 2010-07-28 12:16:28 +02:00
Erik Verbruggen
a8179152c9 Added tests for the InsertionPointLocator and fixed bugs. 2010-07-28 12:10:11 +02:00
Erik Verbruggen
aec36eec7c Use the new InsertionPointLocator for declarations. 
Still need to change it to use RefactoringChanges, and to do better definition
generation.
 2010-07-28 12:10:11 +02:00
Lasse Holmstedt
b6f42dc7b3 added missing license headers 2010-07-28 11:40:04 +02:00
Lasse Holmstedt
40148ad10b Added crumble path to QML observer for showing the current context 2010-07-28 11:36:54 +02:00
Lasse Holmstedt
de4158bdb1 Adjust border rects close to screen borders so that they are visible 2010-07-28 11:35:56 +02:00
ck
5ff0d9b72f Maemo: Rename some classes. 
All our classes should have the Maemo prefix because we don't have
a namespace of our own.
 2010-07-28 09:36:30 +02:00
Bill King
8abed8a0ee Fixes crash when colorname is a set of empty quotes 
BugReport: QTCREATORBUG-1959
 2010-07-28 13:22:20 +10:00
kh1
7920091925 Actually it is a struct. 2010-07-27 18:15:03 +02:00
kh1
d0b7519505 Some more preparations for task QTCREATORBUG-1663. 2010-07-27 17:58:07 +02:00
kh1
9cfa8d5a0e Class to read the device environment. See task QTCREATORBUG-1663 2010-07-27 17:58:07 +02:00
ck
11d0951924 Maemo: Fix ProFileOption settings, write INSTALLS in maemo scope. 
Task-number: QTCREATORBUG-1951
Reviewed-by: kh1
 2010-07-27 17:28:23 +02:00
Erik Verbruggen
3bc473c0c2 Temporary fix to get at least some name back. 2010-07-27 15:58:27 +02:00
Erik Verbruggen
b2659950e2 Added the InsertionPointLocator. 
For answers to questions about where to insert a snippet/chunk of C++ code. Ok,
currently it will only find the One And Only place to insert method
declarations in classes, and it will need some tuning.
 2010-07-27 15:32:40 +02:00
dt
51d6b09efc Modify color mixing for compile output / application output 
Task-Nr: QTCREATORBUG-1875
 2010-07-27 15:21:51 +02:00
dt
3bebc091af Fix too many newlines in compile output 
Task-Nr: QTCREATORBUG-1867
 2010-07-27 14:28:38 +02:00
dt
f3de5fb610 Fix DESTDIR=. case 
Qmake treats "." special, we need to do the same
 2010-07-27 14:28:24 +02:00
ck
ddfdf2ede9 Maemo: Set cumulative mode on for our pro file evaluator. 2010-07-27 14:08:53 +02:00
Leandro Melo
9946711166 QmlJS: Don't detect type from expression if the type is given explicitly. 
To make sure
property color foo: "white"
is of type color, not string.

Done-with: ckamm
 2010-07-27 13:43:51 +02:00
Leandro Melo
302e93d67f QmlJS: Set type correctly for color properties. 
Done-with: ckamm
 2010-07-27 13:43:50 +02:00
Olivier Goffart
713e4c2621 QmlJsDelta: give a valid label to the UiScriptBinding 2010-07-27 11:56:59 +02:00
Lasse Holmstedt
9d9fca6c7e disabled color box when debugger is not active 2010-07-27 11:58:39 +02:00
Lasse Holmstedt
cdb5dadfc2 QmlJS Live Preview: Fixed highlighting from text editor-> qml observer 
Now, the items about to be selected must inherit from QGraphicsObject.
Also, coding style was cleaned up a bit.
 2010-07-27 11:58:38 +02:00
Lasse Holmstedt
689cbc06f1 QmlJS Live Preview: Showing object id's in context menu 
To show the object string id's, the debug protocol is used to get them.
The problem is that the required methods in QDeclarativeContext(Data)
are not exposed, and it's too late to do it for 4.7.0. Hence this change
should be reverted in 4.8 when more efficient way of getting the id's
comes available.
 2010-07-27 11:58:38 +02:00
Lasse Holmstedt
fb681918c6 QmlJS Live Preview: Added color box to toolbar 2010-07-27 11:58:38 +02:00
Lasse Holmstedt
c7a8d93765 QmlJS Live Preview: Implemented "Apply changes from Qml File" button 
The button is checkable and pressing it will stop/propagate changes to
the qml application being debugged.
 2010-07-27 11:58:38 +02:00
Lasse Holmstedt
70f2243bde QmlJS Live Preview: Added title to anim speed context menu 2010-07-27 11:58:38 +02:00
Erik Verbruggen
9b656eb1de Changed the description to include the new file name. 2010-07-27 09:59:59 +02:00
Leandro Melo
2ec04fb6ca Highlighter settings: Change label text. 2010-07-27 09:54:20 +02:00
Leandro Melo
a1b36cf4a2 C++ tooltip: Resolve variable declarations to their named types. 2010-07-27 09:43:22 +02:00
Erik Verbruggen
c8016e8502 Put the quickfix implementations into a separate file. 2010-07-27 09:29:22 +02:00
Pawel Polanski
1162b09af7 Creation od "Copy Destanation" path for sis package has been fixed 2010-07-27 09:11:58 +02:00
dt
05ae17eadd Fix subdir project deployment for symbian 
We create a .sis package per leaf project now, deploy all of them and
start the executable for the runconfiguration that was selected. This
does not cover all use cases, but works for development.
 2010-07-26 19:44:07 +02:00
Joerg Bornemann
253cbf3c03 remove use of QMLJS_EXPORT from the qmljseditor plugin 
compiles now on Windows! :)

Reviewed-by: dt
 2010-07-26 17:39:19 +02:00
ck
0cc983c801 Maemo: Use existing project files watcher. 
Also get rid of unneeded state.

Reviewed-by: kh1
 2010-07-26 17:32:29 +02:00
Joerg Bornemann
743a83b647 cdb plugin: fix borked merge 2010-07-26 16:34:44 +02:00
ck
f580db954f Maemo: Finish implementing "remote mount" feature. 
Disabled on Windows for now due to utfs-server not working there.

Reviewed-by: kh1
 2010-07-26 16:09:04 +02:00
kh1
7608604c5f Remove superfluous class member. 2010-07-26 16:08:21 +02:00
Pawel Polanski
1a820256b1 User installation has is launched if silent one fails. For Symbian OS 2010-07-26 15:16:56 +02:00
con
fb10a2345d Re-enable expanding on double-click in search results pane. 
For some items with Symbols Search this will now both expand and jump to the
result.
 2010-07-26 14:45:07 +02:00
Pawel Polanski
c7278acda0 Installing on a drive other than C: for Symbian OS 
Silent installation added to Sumbian's Run Configuration UI

Reviewed-by: Tobias Hunger
 2010-07-26 13:32:03 +02:00
Erik Verbruggen
d980e37e24 Reworked the QuickFix infrastructure. 2010-07-26 13:07:19 +02:00
Erik Verbruggen
5bf0ba0b85 Clarified that the Symbol's line/column are 1-based. 2010-07-26 13:07:19 +02:00
Olivier Goffart
0ba5dc8d58 QmlJsDelta: Fix the fact that sometimes, when inserting items, the new item could match the next item 2010-07-26 13:09:56 +02:00
con
001e759b2a Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/cdb/cdbdebugengine.cpp
	src/plugins/debugger/cdb/cdbdumperhelper.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
 2010-07-26 12:37:57 +02:00
con
05ed39bb81 Merge commit origin/2.0 '6bd790bd0fa85ddebc680ca4af4878e17e82879b' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	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/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	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/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.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/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
 2010-07-26 12:27:47 +02:00
con
39a8e97775 Merge commit origin/2.0 '1a985148340ff3b29c752036857446452cf0907f' 
Conflicts:
	src/plugins/qmldesigner/settingspage.ui
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-07-26 12:26:05 +02:00