Commit Graph

2960 Commits

Author SHA1 Message Date
Christian Stenger
1f5b3ed670 Squish: Cleanup tst_simple_analyze
* workingDir should not be global
* handle missing Qt Creator plugins on startup

Change-Id: Ibb8267da9d3443104f6d895ff98b6047f693284e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-23 16:11:16 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
2013-04-23 11:13:25 +02:00
Christian Stenger
a50f4073c8 Squish: Improved QmlProfiler test
Change-Id: I2ad50fac22a02de79643eb4d8a06c8736bb8539c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-22 14:12:16 +02:00
Eike Ziller
37cd957a94 Now really fix the treeviewfind test for 2.7
Change-Id: Ia3d1fa31bb8045ecb7638c5dfe800bb57f449cfa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-19 12:50:41 +02:00
Przemyslaw Gorszkowski
080bf4ecb8 C++: improve support for anonymous classes
Fix:
* highlighting
* find usages
* follow symbol
* code completion

Task-number: QTCREATORBUG-6497
Task-number: QTCREATORBUG-8963
Task-number: QTCREATORBUG-3610
Task-number: QTCREATORBUG-7579

Change-Id: I3dcaf1c515d0199c3e6bee72284fbb40064686ee
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-19 12:14:56 +02:00
Eike Ziller
87284f7df8 Revert "Revert "Fix building treeviewfind test.""
Reverts the revert that was needed for 2.7.
This reverts commit 3110c28cc1.

Change-Id: If7f4d22f3d339842e6a5846e2edb99e2c961a794
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 09:06:39 +02:00
Eike Ziller
26cf7be1c3 Merge remote-tracking branch 'origin/2.7' 2013-04-19 09:05:42 +02:00
Eike Ziller
3110c28cc1 Revert "Fix building treeviewfind test."
That shouldn't have gone into 2.7...
This reverts commit 4647cb77d3.

Change-Id: I4abfc8120d7c3d5a6b9e11d212f955cd66ba01a5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 09:02:51 +02:00
Erik Verbruggen
63a04e0c15 C++: replace Q_UNREACHABLE by QTest::qFail.
Q_UNREACHABLE was introduced in Qt5, so using it impossible to compile
the tests with Qt4.

Change-Id: I0ed23ad9390b1428513a7a0c975dd8fb72efb001
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-18 15:50:00 +02:00
Eike Ziller
55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD
Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
2013-04-18 12:54:37 +02:00
Eike Ziller
4647cb77d3 Fix building treeviewfind test.
Change-Id: If4211acb37cb3c87a901ebf3da030bd1da3cf99c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-18 12:50:59 +02:00
Erik Verbruggen
4b0f70f4c9 C++: highlighter clean-ups
- Moved TextEditor::SemanticHighlighter::Result to
  TextEditor::HighlightingResult
- Moved SemanticInfo::UseKind to CppHighlightingSupport::Kind

Change-Id: I14faab1891ca691a0691cfd9243edf19fcd3d3df
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-18 12:25:24 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
Eike Ziller
1610093ca3 Fix filesearch test.
Clang complained that the operator== was not defined in Utils namespace.

Change-Id: I64853ddf3a081991cfb276b3be3a243fda87a740
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-17 15:30:46 +02:00
Robert Loehning
3fd74568b8 Squish: Updated checkLastBuild()
Change-Id: Iebe27d2d4d08fde62398cd711ad557f16a6f3974
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-17 15:18:48 +02:00
Przemyslaw Gorszkowski
17cd161a9d C++: fix cloning of templates
Fix instantiation of templates(by cloning original symbols). Assigning of scope
for cloned symbol is taken from the symbol which is used to instantiate.

Task-number: QTCREATORBUG-9098
Change-Id: I066cc8b5f69333fabdaf2d4466b205baf08bd3f1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-17 14:10:32 +02:00
Eike Ziller
3c5d737834 Fix searching in search results (and other tree views).
Task-number: QTCREATORBUG-9066

Change-Id: I76b7916b4ce64c400c175e72edc2b0a3ef015156
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-17 13:48:53 +02:00
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
Erik Verbruggen
a0d6df7bd8 C++: also refresh files not in the project when project changes.
System headers and other file which are not explicitly mentioned in the
project must be reparsed when the project changes.

Task-number: QTCREATORBUG-9056
Change-Id: I32f1206d241a078a4d9b15fac5813f365a1ba303
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-16 11:56:18 +02:00
Robert Loehning
0a79a50d06 Squish: Fix cleanup gone wrong
Change-Id: Iebd03914a2abcfa014288f82360687f18d6bacd9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-12 18:14:34 +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
Christian Stenger
2a261588f4 Squish: Add helper functions to Target class
Change-Id: Iba67cc28d29346689ca8443ce0b594056feaa0cf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-10 13:39:10 +02:00
Christian Stenger
c74bb8dfca Squish: Clean up
Details:
 * removed unused functions
 * removed "QtQuickConstants" (Targets class is used for more than just Qt Quick)
 * removed Components class

Change-Id: I2908348db3e5a627d63242f9524832812822f790
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-10 12:15:29 +02:00
Christian Stenger
ac57bee146 Squish: Fix execution of tst_simple_debug
Targets checked for debugging libraries now match the targets
selected while creating the project.

Change-Id: Ib5e73254b549a66850da64ffb955531aae6b3477
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-09 16:54:03 +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
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
2013-04-08 13:26:37 +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
Robert Loehning
f4eddb96ea Squish: Using default installation of Qt5 on Windows
Change-Id: Ib1ec62fce66487591cadb8c0bec0d378721ebbb0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-05 16:38:12 +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
Robert Loehning
970b55b125 Squish: Added Qt5 to default desktop kits
Change-Id: Iefb0db16224c5b044ea0019be7d2914cc4b4892e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-05 13:54:14 +02:00
Robert Loehning
b8773c9a7d Squish: Prepare tst_simple_analyze for Qt5
Change-Id: I91caa064e002cc2ab409ec9b1c30ec57c1adb5a9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-05 13:52:14 +02:00
Robert Loehning
3c24824b0f Squish: Explicitly restricting tst_build_speedcrunch to Qt 4.7
Change-Id: Ib28f77d1da9573c4124e5db8e7e972bbabf6ac6a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 19:37:14 +02:00
Robert Loehning
d3b68556fa Squish: Let iterateBuildConfigs() give information about kit
Change-Id: I283fbc773c0490c4c9cb5558e9aedfdb94ba5366
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:30:42 +02:00
Robert Loehning
4319b64c62 Squish: Fixed typo in getQtInformationForBuildSettings()
Change-Id: Ice68ff84354fa35da7d1217abc3e40acc3783691
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:30:27 +02:00
Robert Loehning
286240af0e Squish: Removed pointless lines
Change-Id: I867acd4e00531d6d50553710a00b1cadfc0c3cee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:30:15 +02:00
Robert Loehning
f694b04b68 Squish: Replaced duplicate bugreport
Change-Id: I73bc3a633e47ddd0580976dd355da323e2426b4f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:30:01 +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