Commit Graph

945 Commits

Author SHA1 Message Date
Erik Verbruggen
3173f6fb3e C++: fix highlighting for template parameters for function calls.
Change-Id: Ie0133893d8b8d35ea2aa599cb8f7d5c2cc55271e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-16 12:05:06 +02:00
hjk
1fd4b8788d Debugger: Adjust autotest to bridge changes
Change-Id: I7fc1db372509c3b7d0d57d5d587df0bfa80afb16
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 15:29:27 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
2013-04-11 18:27:52 +02:00
Christian Stenger
2cb6b27de2 Fix valgrind tests
Change-Id: I71bd88fb5a2041aacc3fa2e0de17820ee1db6c69
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-11 17:02:05 +02:00
Przemyslaw Gorszkowski
bde6667240 C++: name of function of class problem
It fixes:
* highlighing
* find usage
* follow symbol

when function of class has the same name as:
* local variable
* template parameter
* other struct/union/class/enum
* function argument

in function scope.

Task-number: QTCREATORBUG-8902
Change-Id: Iddc0f764af689babb40d39460d174bac7b919b31
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-10 14:58:48 +02:00
Przemyslaw Gorszkowski
9c2a352027 C++: fixed operator arrow of nested class of enclosing template
Fixed:
* code completion
* highlighting
* find usage
* follow symbol

Task-number: QTCREATORBUG-9005
Change-Id: I3fcc2638482ca1071c1aa7b6aab0d4dd128595bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-10 14:52:20 +02:00
Erik Verbruggen
82e347095c C++: Untangle include file resolving from loading.
Change-Id: Iacf8cb12dd623c908538d80ee2595297a9bdde71
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-09 11:56:02 +02:00
Erik Verbruggen
857457e057 C++: handle non-arguments in function parameter scope gracefuly
Task-number: QTCREATORBUG-8316
Change-Id: I8897f75f30d3aeaf049cc792060c582ab1e3343d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-09 11:49:00 +02:00
Sergey Shambir
2ead48fb26 CPlusPlus: fixed parsing function-try-catch with ctor-initializer
C++ standard defines that 'try' should be before optional ctor
initializer, so wrong order changed. Added documentation to
parseTryBlockStatement and new test.

Task-number: QTCREATORBUG-9064
Change-Id: Id19cdc53c034cb1232ae27e0bfe36d85b7ad0452
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-09 11:31:28 +02:00
Przemyslaw Gorszkowski
7c74482ad3 C++: fixed operator* for nested class of enclosing template class
Fixed:
* highlighting
* follow symbol
* find usage

Task-number: QTCREATORBUG-9006

Change-Id: I34a42f8665335857f41290217e7265e8a752455b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-09 11:23:14 +02:00
David Schulz
0042175e57 Debugger: Fix compile of dumper test.
Doesn't compile on windows because of
ambiguous symbol GdbEngine.

Change-Id: I4cdad73f249d18e5721066cf0929b0990209d961
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-09 10:07:17 +02:00
David Schulz
f9c31b4c6b Debugger: dumpertest: Dump expanded locals
...separate for the cdbengine. Workaround for
all symbols with virtual children.

Change-Id: I166b30af6594bde1093896156d86b28f02ed8a6a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 09:35:28 +02:00
hjk
4efd12a755 Debugger: Add LLDB to dumper test infrastructure
Not working yet.

Change-Id: I87bd15d8c4aee491404b57842884220103a63e1f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-05 17:23:15 +02:00
hjk
21da8c641d Debugger: Add dumper test for inheritance edge cases
Change-Id: Ia4db7dfc0a0182126255393730d15d12abaf369b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-05 14:29:43 +02:00
Oswald Buddenhagen
66a3553107 make library and plugin dependencies declarative
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.

Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-03 14:37:45 +02:00
Oswald Buddenhagen
7923032022 fix include style relating to cplusplus libraries
... and adjust INCLUDEPATH accordingly.

while i'm at messing with include statements, also re-order the include
blocks according to policy and sort them within bigger blocks.

Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 13:40:39 +02:00
Orgad Shaneh
f172818588 Tests: Export plugins in PluginManager
Without this, lib file is not created using MSVC, and
the build of dependents fails

Change-Id: I37ca02d8e1c6b99fdf901679ccee932f1ed55450
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
(cherry picked from commit d59651cb39)
2013-04-03 11:51:55 +02:00
Oswald Buddenhagen
ca1e65c7f0 fix subprojects re valgrind tests
amends e6c0c292b9

Change-Id: Ib57bf0315b92f8c9a0face9faa3da76f383346e8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-02 17:38:49 +02:00
Oswald Buddenhagen
001a26a4bb include qttest.pri centrally
Change-Id: I05e85dac15e7de52ad04bde899dcc3cb8e603d3e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 17:11:37 +02:00
Oswald Buddenhagen
5ad0908087 remove redundant cpptools.pri include
Change-Id: I09bc8a20a3608b52784de2b262b2f06ac7f217bf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 17:11:02 +02:00
Oswald Buddenhagen
cf5937a8ef remove redundant INCLUDEPATHs
src/plugins and src/libs are included by qtcreator.pri

Change-Id: I15ec19856366661bfa74d00e6278f4eb3854acb2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 17:10:07 +02:00
Oswald Buddenhagen
3893bb13b4 fix include style and remove subsequently redundant INCLUDEPATHs
Change-Id: I9e6950d30c7a65229559c7046a7cc8c903964065
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 17:09:47 +02:00
Orgad Shaneh
f35f7b207f Tests: Remove unneeded define
It is unneeded for any Qt version since commit
3d629b1a2b

Change-Id: Ib58795a53eb3f5614a722282439d26d3250f7d03
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-02 15:15:43 +02:00
Christian Stenger
e6c0c292b9 tests: move valgrind into auto tests
* re-added some test data files
* added QSKIP for not existing data files

Change-Id: Ie0ae3f563e0d94534b620320176b7ec56e36d313
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-02 14:20:23 +02:00
Orgad Shaneh
d5e41c08f5 Tests: Add missing include for MSVC
Change-Id: I95196a8d57a8bf8f09a52aa54fa1c8bbfe752168
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from commit 1db74e381c)
2013-04-02 14:14:46 +02:00
Oswald Buddenhagen
c61210089f define QT_CREATOR centrally
numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.

Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 12:20:37 +02:00
Orgad Shaneh
d59651cb39 Tests: Export plugins in PluginManager
Without this, lib file is not created using MSVC, and
the build of dependents fails

Change-Id: I37ca02d8e1c6b99fdf901679ccee932f1ed55450
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-28 09:02:43 +01:00
Orgad Shaneh
aa3dcd92b7 Tests: Fix compilation with Qt 5.0.1
Change-Id: I6e9d5fd34bec8cbecaa4868b5e07cc11d490d6d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-27 16:17:16 +01:00
Orgad Shaneh
6dc975a8ad Tests: Fix MSVC errors and warnings
Change-Id: I7350b3fe751a76787a932e1346ad19377a6ea9bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-27 16:14:24 +01:00
Orgad Shaneh
1db74e381c Tests: Add missing include for MSVC
Change-Id: I95196a8d57a8bf8f09a52aa54fa1c8bbfe752168
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-27 16:10:01 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
2013-03-26 13:09:43 +01:00
Nikolai Kosjar
e088541c0d C++: Temporary fix for dangling pointers in ResolveExpression
Task-number: QTCREATORBUG-8974

Change-Id: Iac114881741bdf8fd477541b28e4d31b7a1760f0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-03-22 08:57:53 +01:00
David Schulz
b8d5c762ec Debugger: Port Dumpertest to be used with cdb.
Change-Id: I18fbd216d761ef66a9628e84669d6cd5b493d7b7
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-03-20 10:43:33 +01:00
jkobus
7d41817ec3 Add cleanupSemanticsLossless for even betten diff output
This can format the output in a more human friendly format:
EQ("Th") INS("at c") EQ("at cartoon") -> EQ("That ") INS("cat ") EQ("cartoon")

Change-Id: Iab545c0c0bccffa379f346e482b17b574e05e88a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-15 14:32:58 +01:00
jkobus
41fa8c3528 Add cleanupSemantics method, produce nicer diff output
Change-Id: I877e06c930c219ad23af4b7c6078d8c8db3706e9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-14 09:36:15 +01:00
jkobus
2433ee7da0 Add autotests for diff editor
Change-Id: I46c1d5c623b0ffd8c0dc16d218094d05c9975ea5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-12 13:56:54 +01:00
Eike Ziller
3bc622400d Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
2013-03-12 10:56:52 +01:00
David Schulz
b46ec1db9d Debugger: Dumpertest: Add getter for autoremove property
... to the TemporaryDir class for Qt4.

Change-Id: I5cecb4dd0af640485cdb3e4d7222ea675e060e01
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-03-12 10:48:24 +01:00
David Schulz
ec724f9a46 Debugger: DumperTest: Stop on failure.
Change-Id: Ie56d1c746013b21037291208ab51fdee8e01a8cd
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-03-12 10:48:07 +01:00
Christian Stenger
4c877c70b5 tests: Fix compile with Qt4
Change-Id: Ibad7e607ced1c6acdad829af82e1b874ddacb871
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-12 09:29:41 +01:00
Nikolai Kosjar
ceb314b3ec C++: Tests: More lexer tests for doxygen comments
Change-Id: Ib031eb791f0a089376d02cc75a62fcc7d1f859cb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-03-12 09:04:07 +01:00
Nikolai Kosjar
47d60ae89a C++: Consider '^//[/!][^\n]*' as doxygen comment
Now everything following '///' or '//!' is a doxygen comment.

This simplification fixes also the bug ('\n' was considered as part of
the doxygen comment and led to strange highlighting).

Task-number: QTCREATORBUG-8921

Change-Id: I6dae3b80ec11400f2f623897257782a80860a7f3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-03-12 08:31:05 +01:00
Nikolai Kosjar
29055f9f43 C++: Fix crash due to dangling pointer
ResolveExpression used the wrong Control object, which was deleted by
~LookupContext() in TypeOfExpression::operator()). ~Control() led to the
dangling pointer.

Task-number: QTCREATORBUG-8890
Done-with: Erik Verbruggen <erik.verbruggen@digia.com>

Change-Id: Ic07947ee54087446b730e4d3ec4bef29defa4495
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-03-12 08:29:48 +01:00
Oswald Buddenhagen
eb93ad3553 fix arguments in parsedProBlock() calls
Task-number: QTCREATORBUG-8934
Change-Id: Ifcf0de22d8beed692fccc5fca162ec9fa5d97a7f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-03-11 17:15:27 +01:00
hjk
e1f0840820 Debugger: Allow specification of gdb version constraints in tests
Change-Id: Ida6ada411ec818d7570f36d1d58576a93b8262ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-08 17:31:23 +01:00
Eike Ziller
f60873a24f Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
2013-03-08 11:39:33 +01:00
Christian Stenger
bebf8d50a9 tests: let tst_dumpers compile with Qt4
Change-Id: I34851ebfc054f0f8265e5ce1623e0db956aab085
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-06 15:12:20 +01:00
Orgad Shaneh
ef8787e59f Fix tests compilation
Change-Id: I20d990b6be83e5fcd30a8911bcd2bbe8cc303989
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-03-05 09:01:18 +01:00
Christian Stenger
4e6c539685 tests: allow execution of test from outside
It shouldn't be necessary to be located inside the pluginspec
folder to execute this test.

Change-Id: I11661760a4d80a4f36980ad6e0077345c56b26e5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-04 15:36:03 +01:00
Eike Ziller
7545ce072f Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
2013-03-04 15:07:19 +01:00