feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,084 Commits 108 Branches 368 Tags
e32cf192f7ba34dda96b61507b440c6a17b51a0c
Commit Graph

39 Commits

Author SHA1 Message Date
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
hjk
d6a459c332 cppmodelmanagerinterface: use singleton instead of object pool 2011-01-05 09:56:00 +01:00
Christian Kamm
5f50a6ae34 C++: Move the ModelManagerInterface from CppTools to CPlusPlus. 2011-01-04 15:58:21 +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
Jarek Kobus
9231bf2a9c Fixes: Add "const &" when needed in "Go to slot" 
So that now when you do "Go to slot" for "valueChanged(QString)"
signal the newly created slot will get (const QString &) decoration.

RevBy: Friedemann Kleint <qtc-committer@nokia.com>
 2010-12-06 14:11:35 +01:00
Jarek Kobus
95117681d8 Fixes: Provide arg name in "Go to slot" when arg is missing 
Task:     QTCREATORBUG-1721
RevBy:    Friedemann Kleint <qtc-committer@nokia.com>
 2010-12-06 11:55:19 +01:00
Erik Verbruggen
3ebc328498 C++: added quickfix to insert a method definition. 
Reviewed-by: Christian Kamm
 2010-09-30 12:19:39 +02:00
Erik Verbruggen
f39494e4c2 C++: make InsertionPointLocator ready for re-use. 
(cherry picked from commit 519f1d11947ff3109850e559fae868c4a55deb43)
 2010-09-27 19:07:15 +02:00
Friedemann Kleint
1b414e00ca Designer: Set C++ suffix and header lower case setting. 
to be used for the promoted widgets dialog.
See also 00e954ca817f89958a8a8777d93d3843252dc88c in Qt 4.8.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTCREATORBUG-163
 2010-08-23 15:05:20 +02:00
Erik Verbruggen
6bbc732a29 Sprinkled a bit of doxymentation over various classes. 2010-07-28 17:34:00 +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
Roberto Raggi
b374fcc4b0 Removed unused variable. 2010-07-19 17:54:37 +02:00
Erik Verbruggen
3bcfa87b90 Removed usage of Symbol::endOffset(). 2010-07-16 16:04:58 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-11 16:30:39 +02:00
kh1
1b6ad08795 Move help manager into core. 
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
 2010-06-11 13:11:37 +02:00
hjk
5806009d29 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
 2010-06-02 09:57:23 +02:00
Friedemann Kleint
3330d15964 Qt Designer integration: Fix Help button in stylesheet editor. 
Wire QDesignerIntegration's help signal to help manager.

Task-number: QTCREATORBUG-1505
Reviewed-by: kh <qtc-committer@nokia.com>
 2010-05-28 15:58:55 +02:00
Roberto Raggi
653ca110fe Removed DeprecatedLookupContext. 2010-05-26 15:56:12 +02:00
Roberto Raggi
149f2c2b1c Ported the qt designer integration to use Snapshot::findMatchingDefinition(). 2010-05-11 14:15:07 +02:00
Roberto Raggi
f71f6200ff Compile. 2010-05-10 13:55:11 +02:00
Roberto Raggi
32a84df5c0 Deprecated the current LookupContext. 2010-05-05 16:36:44 +02:00
Friedemann Kleint
7828bb811c DesignMode/Qt Designer clean-up Part V: Renaming 
Re-introduce FormWindowEditor as IEditor used for
Designer. Use SharedTools::WidgetHost directly
for embedding into FormEditorStack, doing the
geometry-changed handling in there as well.
 2010-03-10 10:21:52 +01:00
Friedemann Kleint
c7e3e6adf3 Design mode/Qt Designer clean-up, part III: Resources. 
Move resource code to new ResourceHandler class and
instantiate it on the form window.
 2010-03-09 17:01:51 +01:00
Friedemann Kleint
1b86bc50c1 Design mode/Qt Designer: Clean up the widget part of it. 
- Remove shared subwindow reparenting from EditorWidget, make EditorWidget
  inherit FancyMainWindow. and use just once instance of it instead of
  per-editor ones.
- Embedded FormEditorStack into EditorWidget as a centralwidget.
- Changed FormWindowEditor's base class from IEditor to SharedTools::FormWindowHost
  (Widget) to be embedded into FormEditorStack (no need to be an IEditor),
  Remove Designer::Internal::FormWindowHost which had little functionality.
- Add Design Mode widget to FormEditorW which has FakeToolBar and EditorWidget
  (single instance) in a vertical layout.
- Removed ProxyAction class handling dock view toggle actions of several EditorWidgets
  (no longer necessary since there is just once instance). Moved "View menu" to bottom.
- Started to make FakeToolBar work as a single instance listening on changing
  xml editors
- Include-file/slot connection clean-up.
 2010-03-09 10:26:20 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
57d3aa8840 Designer: Fix goto slot in case of sources in different paths. 
Check on path is too strict (since the documents are already
limited to the ones including the header).
Task-number: QTCREATORBUG-746
 2010-03-04 09:33:28 +01:00
Tobias Hunger
592e494d1a Fix typos 
Reviewed-by: thorbjorn
 2010-01-11 10:26:13 +01:00
Roberto Raggi
14376c3c32 Initial work on the new CPlusPlus::Snapshot. 
Encapsulate the details.
 2009-12-07 10:54:27 +01:00
Friedemann Kleint
087e72499e Designer: Prepare re-implementation of "Goto Slot". 
...making use of the new code model features. Move code to
separate file. Make it possible to obtain path to generated
header file from project manager.
 2009-12-03 16:23:15 +01:00
Roberto Raggi
7c7ce13ac0 Use const names. 2009-12-01 12:46:23 +01:00
Friedemann Kleint
213b8638ed Designer: Restrict files used for "Go to slot" to project of ui-file. 
Reviewed-by: con
Task-number: QTCREATORBUG-245
 2009-11-18 10:31:16 +01:00
Jarek Kobus
37e08bbdd4 Fix a bug when processing the comment 
When we meet /* we look for closing */ and continue processing from the next char, not from '/' which was a part of the closing comment
 2009-11-13 08:52:35 +01:00
Jarek Kobus
1fd9ebfcaf Fix parsing the end of class definition. In case we look for closing '"' character we count preceding '\\' characters to detect if we should skip the '"' or not. The bug discovered during doing the similar parser for eclipse. 2009-09-02 15:40:14 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +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
d971065b36 Renaming workbenchintegration.h/.cpp to qtcreatorintegration.h/.cpp 2009-05-08 16:43:26 +02:00