feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,354 Commits 108 Branches 368 Tags
f41bcb450137024fe66f8c77dccb51b8c3a40154
Commit Graph

37 Commits

Author SHA1 Message Date
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
con
edeb415908 Merge remote branch 'origin/2.1' 2010-12-10 11:09:55 +01:00
dt
d2c7aad84d FlatModel: Fix sorting 
Mea culpa
 2010-12-10 11:09:17 +01:00
dt
216bdca7d6 ProjectExplorer, FlatModel: Crash fix 
sortNodes only ensured a partial ordering, we need a total ordering.

Reviewed-By: con

Task-Nr: QTCREATORBUG-3317
Task-Nr: QTCREATORBUG-3302
 2010-12-09 15:25:22 +01:00
dt
01592d60d6 FlatModel: forgotten change + compile on windows 2010-11-18 18:20:33 +01:00
dt
bdc0e29241 FlatModel: The simplified tree did not react to hasBuildTarget changes 
Task-Nr: QTCREATORBUG-3014
Task-Nr: QTCREATORBUG-2821
 2010-11-18 17:47:01 +01:00
dt
fff3309e4d ProjectExplorer: Add expensive asserts to FlatModel 
Should help in debugging QTCREATORBUG-2821
 2010-11-15 12:58:48 +01:00
Friedemann Kleint
22f03cbde6 ProjectExplor/Debugger: Header cleanup 2010-11-02 16:14:00 +01:00
dt
b02add2490 Add QML folder in project tree, show files there 
Use the full path for folders to sort in the project tree.

For virtual folders ensure that the path ensures the sorting we want.

Reviewed-By: kkoehne
 2010-08-11 12:10:43 +02:00
dt
9bc9fe73e1 File renaming 
Reviewed-By: con
Reviewed-By: Friedemann Kleint

We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.

Note: Only the qt4projectmanager knows how to rename files.

Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.

Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
 2010-05-12 14:14:44 +02:00
dt
7a8cf80976 Sort case insesitive in the project tree 
Task-Nr: QTCREATORBUG-979
 2010-05-03 11:25:09 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger
5173c2dc01 s/target/buildtarget/ in projectnodes 
This is in preparation of the addition of "targets" in the sense
of "platforms to develop for" into the codebase.

Reviewed-by: dt
 2010-02-02 12:59:29 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Oswald Buddenhagen
ec2fa92ee0 delete DetailedModel - it is unused 2009-12-02 17:47:17 +01:00
dt
e7c1ba536a Remove variable that is never set but used. 2009-10-05 18:42:44 +02:00
Friedemann Kleint
ad294f8467 Project explorer: Make public headers compile with NO_CAST_FROM_ASCII 
.. and purge unneeded includes.
 2009-09-29 11:39:55 +02:00
con
7ebea974d6 Show pro file's subdirectory structure in project tree in non-simple mode. 
Also adding category folders for the different file types
(source files, header files, resource files, form files, other files).
 2009-08-21 14:53:25 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED 
There were both variants, with and without extra semicolon.
 2009-07-13 17:35:17 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Alessandro Portale
eed3c413e1 Don't annoy Windows users with alien dir separators 2009-04-15 17:32:53 +02:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
dt
8c9e938385 Fixes: Crash in the flat model on certain changes to the pro file. 
Task:     240180
Details:  Hopefully fixes a few crashes people have reported.
 2009-01-08 17:44:48 +01:00
dt
d402ed2955 Fixes: Replace QTC_ASSERT with QT_ASSERT. 2008-12-17 15:51:48 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
dt
a7227782db Fixes: Saving and restoring of ProjectTreeWidget states 
Task:     Reported on the ML multiple times.
Details:  Add a few methods to make it possible to save and restore
settings. Save those settings to the .ini file. (I'm not sure whether
seesion would be better, let's see what feedback we get.)
 2008-12-11 14:35:14 +01:00
con
4556e602c5 Fixes: - At startup project tree filter setting and reality diverge 2008-12-10 17:32:02 +01:00
hjk
4a552ead9f use QTC_ASSERT instead of Q_ASSERT 2008-12-09 15:25:01 +01:00
hjk
342caa2141 some more whitespace changes 2008-12-09 11:07:24 +01:00
hjk
cf11b69643 more code cosmetics 2008-12-02 16:19:05 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00