feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,321 Commits 108 Branches 368 Tags
476338a6d21377f653f24942bb955e8a6cb83c84
Commit Graph

622 Commits

Author SHA1 Message Date
Christian Kamm
a4e85dda53 C++ insert definition: Use minimally qualified names. 
Change-Id: I633dbc77557fc2b6563888103350612a262536ee
Reviewed-on: http://codereview.qt.nokia.com/2731
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-08 14:47:49 +02:00
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3' 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
 2011-07-29 17:57:59 +02:00
Friedemann Kleint
938bcae9d6 Debugger[CDB]: Fix breakpoint location correction in constructors. 
Change-Id: I638554936eae2db7ff2f55508d13f1c52c07f17d
Reviewed-on: http://codereview.qt.nokia.com/2114
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2011-07-25 15:04:59 +02:00
Leandro Melo
23decd9d34 C++ editor: Improve type hierarchy widget 
Now the type hierarchy widget will also show the classes
derived from the selected one. For consistency the way
the base classes are shown was changed too. The diagram
below is an example from Creator's code when openining
the type hierarchy for BaseTextEditorWidget:

Bases
 +QObject
  +QWidget
   +...
     BaseTextEditorWidget
 +QPaintDevice
  +...
    BaseTextEditorWidget
Derived
 +BaseTextEditorWidget
  +VCSBaseEditorWidget
    GitEditor
    MercurialEditor
    ...
   GLSLEditorWidget
   CppEditorWidget
   QmlJSTextEditorWidget
   ...

Depending on the project and on the selected class the
hierarchy widget might take a bit to be constructed.
This should be improved later.

Change-Id: Ifbdd1cbbba955a0bdf03297ff0e7620351b12dc5
Reviewed-on: http://codereview.qt.nokia.com/883
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-07-08 14:50:26 +02:00
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
Erik Verbruggen
b3237d7d42 Fixed (C)opyright headers. 
Change-Id: I755bdd1788770b7edd34f06372219d27abd0af11
Reviewed-on: http://codereview.qt.nokia.com/1214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 11:57:21 +02:00
Erik Verbruggen
7e43490f99 Emit a signal when parsing is finished after updating source files. 
Change-Id: I8a8878c420c0f8d24db16d606aace42519ac3047
Reviewed-on: http://codereview.qt.nokia.com/1151
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-07-05 16:10:06 +02:00
Leandro Melo
83e4a7260d C++ editor: Remove unnecessary line split in find usages 
Avoid extra allocations since we only the actual line for the case.

Change-Id: I0d0f0db394d9075bbdce24d1d5b5efa55c52f9b3
Reviewed-on: http://codereview.qt.nokia.com/261
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2011-05-31 12:08:17 +02:00
hjk
7223cf00e6 cplusplus: remove unneeded declaration and destructor 
Change-Id: I5177c5d46409225a8debda2e0f78fffdea27b266
Reviewed-on: http://codereview.qt.nokia.com/208
Reviewed-by: hjk <qthjk@ovi.com>
 2011-05-30 12:56:38 +02:00
Leandro Melo
ab40e9c78e C++ editor: Remove scanning/caching of includes 
With the completion now in a separate thread this should
no longer be necessary.

Reviewed-by: Roberto Raggi
 2011-05-18 12:35:53 +02:00
Oswald Buddenhagen
882d2ac2a7 fix compile of plugins which use #include <cplusplus/foo.h> 2011-05-16 11:56:36 +02:00
Oswald Buddenhagen
67704b8b41 move src/shared/cplusplus/ -> src/libs/3rdparty/cplusplus/ 
Approved-by: legal
 2011-05-16 11:05:30 +02:00
Erik Verbruggen
e0ae4021bd Fixed auto-test, added constant, and added a bit of doxymentation. 2011-05-09 15:28:11 +02:00
Erik Verbruggen
49814d9ea5 Class to find breakpoint positions for CDB. 
Reviewed-by: Friedemann Kleint
 2011-05-09 13:43:19 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Erik Verbruggen
483875f2be Fixed an off-by-one array-out-of-bounds bug. 
Reviewed-by: Lasse Holmstedt
 2011-04-11 09:56:26 +02:00
Oswald Buddenhagen
7007326837 clean up DEPENDPATH insanity 
simply add
  CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
 2011-03-09 22:24:13 +01:00
Christian Kamm
ccb49b9873 QmlJS: Disable possibly confusing warnings on qmlRegisterType. 
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
 2011-03-03 11:55:48 +01:00
hjk
57eae3191e s:// end of namespace :// namespace :g for consistency 
We use the latter style everywhere else to signify the end of a namespace block.
 2011-02-04 12:45:32 +01:00
Erik Verbruggen
2062747158 Fixed out-of-bounds when originalSource was not explicitly supplied. 
Task-number: QTCREATORBUG-3613
 2011-01-27 14:51:01 +01:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
Friedemann Kleint
a9a5e3ea17 Exported header cleanup. 2011-01-20 14:03:07 +01:00
Erik Verbruggen
dea74862d3 Fixed the line retreival for find-usages. 
Instead of using the pre-processed source, the original one is used.
This makes a difference when a macro is used in the line, where the pre-
processed source would have a "#gen true" token.

Task-number: QTCREATORBUG-3345
 2011-01-17 14:47:20 +01:00
Erik Verbruggen
daafa533d6 Fix find-usages in template classes. 
The problem was that the scope of the class declaration in a template-class
declaration is the template, not the scope in which that template is defined.
The scope-check was not taking this into account.

Task-number: QTCREATORBUG-3183
Reviewed-by: Roberto Raggi
 2011-01-17 13:42:45 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kamm
d3c1dd6a09 C++/Qml: Don't allow exported types to override builtins. 
There was trouble when a plugin qmlRegisterType'd something like 'Item'
into the global default module.

Reviewed-by: Roberto Raggi
 2011-01-10 14:40:40 +01:00
Christian Kamm
283a3d32cd Qml/C++: Fix performance problem with type extraction. 
By moving the offending code into a background thread.

Reviewed-by: Erik Verbruggen
 2011-01-06 15:02:06 +01:00
Christian Kamm
c7070526ec Qml/C++: Allow dynamic uri in qmlRegisterType if fixed by Q_ASSERT. 
Reviewed-by: Erik Verbruggen
 2011-01-06 15:01:59 +01:00
Christian Kamm
ab642bc820 QmlJS: Add refcounting to FakeMetaObjects. 
Previously they were leaked when a qmldump or the C++ exported QML
type list updated.

Just deleting the previous FakeMetaObjects is not an option, as they
might still be used in a QmlObjectValue owned by an Engine.

Reviewed-by: Erik Verbruggen
 2011-01-06 15:01:09 +01:00
Christian Kamm
0194da7300 Qml-C++: Find C++ qmlRegisterType calls and populate QML code model. 
Reviewed-by: Erik Verbruggen
 2011-01-04 15:58:22 +01:00
Christian Kamm
16542241c9 C++: Add parsing of Q_PRIVATE_PROPERTY. 
Reviewed-by: Roberto Raggi
 2011-01-04 15:58:22 +01:00
Christian Kamm
633c254986 C++: Fix bind of Q_INVOKABLE functions. 
Reviewed-by: Roberto Raggi
 2011-01-04 15:58:21 +01:00
Christian Kamm
5f50a6ae34 C++: Move the ModelManagerInterface from CppTools to CPlusPlus. 2011-01-04 15:58:21 +01:00
Christian Kamm
87c8cbf44c LanguageUtils: Introduce new library for cross-language utils. 2011-01-04 15:58:21 +01:00
con
23c22b7c66 License headers, part 2 2010-12-17 17:14:20 +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
Roberto Raggi
972eb8f6e2 Introduced CPlusPlus::SymbolNameVisitor and CPlusPlus::SnapshotSymbolVisitor. 2010-12-15 15:12:52 +01:00
Bill King
df43d55e04 Fixes: More autotest cleanup (now release target builds too) 2010-12-14 12:56:55 +10:00
Roberto Raggi
63138eb808 Added some initial support for function overloading. 2010-12-10 10:32:46 +01:00
Roberto Raggi
f7f3539786 Skip using namespace directives when searching for declarations. 2010-12-03 11:26:31 +01:00
Friedemann Kleint
2960c735df Debugger/CPP: Move helpers to simplify types to CPlusPlus-lib. 
Make available for log simplification, etc.
Add autotest, fix broken std::set and MSVC.

Rubber-stamped-by: Christian Kamm <christian.d.kamm@nokia.com>
 2010-11-25 13:51:54 +01:00
Erik Verbruggen
72aa551a97 C++: implemented switch decl to def for operators 
Task-number: QTCREATORBUG-2313
Reviewed-by: Roberto Raggi
 2010-11-19 11:50:28 +01:00
con
59c301a8c8 Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget. 
qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes
it fail in pri files that are used for app pro files. The tests still
don't run because of run time linking issues.
 2010-11-01 14:55:37 +01:00
Erik Verbruggen
ac9fc40645 C++ Editor: check for method existing decl/def when inserting new ones. 2010-10-08 13:15:20 +02:00
Roberto Raggi
189311816c Resolve local using namespace directives. 
Reviewed-by: Erik Verbruggen
 2010-10-05 14:22:05 +02: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
bd435499b6 Fixed compiler warnings. 
(cherry picked from commit b049937ae013b47e9b86aacd60325dbd382319ed)
 2010-09-27 19:07:35 +02:00