Commit Graph

2960 Commits

Author SHA1 Message Date
Przemyslaw Gorszkowski
421ea2afa4 C++: Test for nested class of enclosing template
Added additional test for change:
23844410fd

Change-Id: I9ddd23b0e852bf88105fef87fae82620da29c0b6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-30 08:09:21 +01:00
Przemyslaw Gorszkowski
7db3b660b6 C++ editor: Highlight member variable
Highlight member variable when there is also
enum value with the same name

Task-number: QTCREATORBUG-7525
Change-Id: I0990844a20fdf9e87a807fde10708344b9c3497b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-29 17:33:42 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +01:00
Przemyslaw Gorszkowski
7fcc52bf47 C++ editor: Highlighting static variables
Fix highlighting, find usages, marking for static variables.

Task-number: QTCREATORBUG-6822
Change-Id: I0c97c93c6c1024550907eec3820496df22a94e85
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-29 14:01:11 +01:00
Nikolai Kosjar
370acaf502 C++: Tests: Add basic tests for CheckSymbols
CheckSymbols is the "data provider" for the semantic highlighter which
does not have any tests yet.

Change-Id: I868aca32d44570457a984b8ce74695c381c58bed
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-29 09:09:15 +01:00
hjk
986ff71642 Debugger: re-enable more tests
Change-Id: Iec02192477cebabd50da0f07b32e95b78eeb0078
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-28 18:16:30 +01:00
hjk
167316d7da Debugger: Work on auto tests
Change-Id: I21e783407a904de3501d0ac89d5f6f497ae4b1fe
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-28 17:17:25 +01:00
Christian Stenger
4cb9f675aa Squish: use new approach for markText()
This new approach is a bit slower than using Qt functionality,
but it's now completely relying on user-interaction.

Change-Id: I361f6f201dfff8122a11aae30204eb79967fe4ae
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-28 17:07:12 +01:00
Robert Loehning
31b135a4b1 Squish: Updated opening of CMake projects
Change-Id: Iad89199052fe8df090eb5a6257dd88de51a15a07
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-28 15:19:48 +01:00
Christian Stenger
128df0f4b4 Squish: Improve Outline test
Added signal, property and function elements.

Change-Id: I3d98bb43baaec45e34cd24963e4d8b64ca624792
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-28 14:10:26 +01:00
hjk
d0cf3b8f1c Debugger: Make some of the semi-automated test real auto tests
Change-Id: Id52cce742fc9fc3467f47e05a94777234aaa2372
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-25 22:05:40 +01:00
hjk
b73849f82e Debugger: Add ability to check multiple results in one sub-test
Change-Id: Icb78a0a7127d06c1b3a2b4ba63fb83bf49cfe044
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-25 22:05:27 +01:00
hjk
3f44b6c4e5 Debugger: Work on dumper auto tests
Change-Id: Ied98a6e9191f39bb223d9f8ab07d44ee103b643d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-25 22:05:02 +01:00
Robert Loehning
db7d64f15f Squish: Made tst_cli_output_console more robust
Change-Id: I00941b2d6f984e3af553d48fdfa747f3d6d1ffd8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-24 17:05:18 +01:00
Robert Loehning
28d731c717 Squish: Exit test cases if runAndCloseApp() failed
Change-Id: I9149673fc1c227543b6d92ece0ed00a993e06ccf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-24 16:40:20 +01:00
Erik Verbruggen
fa7ab13f30 C++: test for walking includes in frameworks.
Change-Id: Id31ce6b40d72351cfaefa5035469b87662526853
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 11:36:22 +01:00
hjk
e52a35a239 Debugger: rename gdb/gdbmi.{h,cpp} into debuggerprotocol.{h,cpp}
The scope is a bit broader nowadays.

Change-Id: I9578da94f06df199be5668c1751fd7bfb37f1c5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-24 11:05:36 +01:00
Nikolai Kosjar
8c3794f9d1 C++: Add star binding to TypePrettyPrinter
Now we can specify if we want to print a whitespace before and/or after
'*'/'&' when printing pointer and reference types.

Task-number: QTCREATORBUG-6169

Change-Id: Ida1b035aa4fd79be9108934b75f236db9f7238af
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-23 14:30:39 +01:00
Robert Loehning
3898effa68 debugger: compile fix for MSVC in self test
Change-Id: I44304538e18775833a995a50d6b696d666083baa
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 14:03:16 +01:00
Robert Loehning
3f570a7901 Squish: Enable testing with MSVC again
Change-Id: Ib6051caa6e3a52a611aa24c0bf0c4d89939fdd58
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-23 12:06:26 +01:00
Robert Loehning
ef3647ad43 debugger: Updated self test
Change-Id: Id9eeb62ff336843ce196dfebc771f03ae22d3cbc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-22 17:49:58 +01:00
Przemyslaw Gorszkowski
23844410fd C++ editor: support nested class of enclosing template
Fixing:
* highlighting
* tooltips
* find usage
* selecting

Task-number: QTCREATORBUG-8245
Change-Id: I6e900799e43126706125b7e424567fca2b2c223e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-22 11:35:25 +01:00
Erik Verbruggen
dada2614d5 C++: add include-guard tracking.
Track the typical #ifndef/#define/#endif usage in header files to see if
the macro is an include guard. If so, store it in the Document. No
behavioural change, just recording the name.

This can be used in the future to track if a file needs to be re-parsed
when a macro changes: if it was used in the file, and not defined in it
nor being the include-guard, a file should be re-preprocessed and
re-parsed.

It can also be used to check if two files have the same include guard.

Change-Id: I2715f529997a7b24a11bdbc6150652e2669f1a46
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-18 14:58:07 +01:00
Francois Ferrand
4c43655cec C++: fix macro calls with comment before arguments
When in 'keep comments' mode, the preprocessor does not properly handle macro calls with
comments between the macro name and the opening parenthesis: "FOO /*something to say*/
(45)".

Change-Id: I6fe733242e4d2ccff2985d17399d0a084917415a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-18 14:56:47 +01:00
Fawzi Mohamed
54bb06435a tests: fix compilation with osx/clang, avoid implicit conversion
- osx clang does not support sending a newly created string to
   an ostream, converting it to c_str
 - avoid std::string(QBytearray), as that skips length (I suppose)

Change-Id: I3712df9d5e4a6f96420a8f2bf59c3bec9286b788
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-18 14:02:03 +01:00
Christian Stenger
00dab06535 Squish: Added test for QML outline
Change-Id: I6199cf22da0049319c2eaef6977884ed7f63a4fd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-18 13:58:33 +01:00
Fawzi Mohamed
db3ad7e2aa debugger: fixing tests
- using .pri file for Utils lib (needed on mac)
 - add SKIP macros to support qt5

Change-Id: I76c970a62c4bb44301a8239c1d0b3eeeff4bc081
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-17 11:43:43 +01:00
Fawzi Mohamed
af559bf837 tests/valgrind: fixing compilation
- convert directly to QString to add to a QTest row and to qMakePair
 - add missing ssh.pri dependency

Change-Id: I819ccfa901f993507d5e449fc68d4317ffa1cebb
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-17 11:02:11 +01:00
Orgad Shaneh
c58482eca4 Tests: Exclude QT_NO_CAST_FROM_ASCII
Change-Id: I5bba2a3bf164e5069938b7835176787beb646817
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-17 10:02:22 +01:00
Christian Kandeler
dd195c9dac Debugger: Fix compilation of name demangler test.
No more automatic QString <-> char* conversion.

Change-Id: I236c119932f11e5c2515a68499451ada0fc4f6f3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-01-16 18:36:27 +01:00
Oswald Buddenhagen
65c169c80e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
2013-01-16 16:46:03 +01:00
Fawzi Mohamed
285bffd99b tests/qmlproject: adding utils lib
Change-Id: I80c952ef8571229893adc6002b39812d6b738b9e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-01-16 15:46:35 +01:00
Fawzi Mohamed
7ae32b1331 qmldesigner: fixing tests
Change-Id: I2d98ea04860dfab083234904aa83f96cf6790472
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-01-16 15:46:10 +01:00
Fawzi Mohamed
2f26e24b86 tests/preprocessor: adapt to api change
Change-Id: I79f79cf548933856cec3cdc59963c63d8f7062c8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-16 15:45:29 +01:00
Fawzi Mohamed
b9ddb34862 tests/cpp-frontent: avoid implicit ascii conversions
Change-Id: Iadd84891958f12d1f87ebe4c87e58f9ebd989697
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-16 15:44:52 +01:00
Fawzi Mohamed
5935ad14d7 tests/ioutils: fixing namespace change
Change-Id: Ie30abed23657e6c2d221877a236468650bbbbd2e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-01-16 14:23:45 +01:00
Robert Loehning
9741e70f30 debugger: Fixed checks for file classes in self test
Change-Id: I5bfe1047ad3b6fc6bd7080c15e6908a47e5ae5a8
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-15 19:30:54 +01:00
Thomas Hartmann
229105ba89 QmlDesigner: adding manual test files for Qt Quick 2.0
Change-Id: I44d3a4165d1ff12488bcc63f19765bc7cf91bc18
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-15 13:51:34 +01:00
Thomas Hartmann
9fd73a2175 QmlDesigner: Fixing broken test case
Since the rect is moved to 648, 480 nothing is visible.
It should be witdth and height instead.


Task-number: QTCREATORBUG-8543
Change-Id: I27721d6df83f5120315bc1f5aff4cc04732e4f60
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-11 15:33:07 +01:00
Robert Loehning
1675beebf3 Squish: Fix WELP03
Change-Id: I811c394b95029addb84a727632cf2ab6901258a5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-11 14:35:30 +01:00
Christian Stenger
0ba7f48d07 Squish: Try to fix test for testing machines
Change-Id: I3213594c9ad7b947c5863d22f87e62adf418d983
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-09 13:06:13 +01:00
Francois Ferrand
5e8c3f4be7 C++: fix constructor definition parsing.
When a constructor is defined with a single, unnamed argument of a custom type without
extra type specifiers (const...), then the constructor was not identified as such.
There was an heuristic in case the constructor was in the class definition, but not if the
the constructor was defined later.

Examples:

class Arg;
class Other;

class Foo {
  Foo(Arg /*arg*/);               // working
  Foo(const Arg /*arg*/);         // working
  Foo(int /*arg*/);               // working
  Foo(Other /*arg*/)         {}   // working
};

Foo::Foo(Arg /*arg*/)        {}   // used not to work, fixed
Foo::Foo(Arg arg){}               // working
Foo::Foo(const Arg /*arg*/)  {}   // working
Foo::Foo(int arg)            {}   // working

Change-Id: I741e4ba62672ddc99a837fdcdc27996fba5ae6c7
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 13:36:43 +01:00
hjk
ad03ebab19 Debugger: QT += webkitwidgets in semi-manual test
Change-Id: I551d0f49d6da2555cfe2acbd28ad5f76f20ea29c
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-03 20:52:27 +01:00
Francois Ferrand
058d2e8cb5 Support preserving case when replacing.
When making a case insensitive search, try to keep the string capitalization when doing
the replace:
      - All upper-case matches are replaced with the upper-case new	text.
      - All lower-case matches are replaced with the lower-case new text.
      - Capitalized matches are replace with the capitalized new text.
      - Other matches are replaced with the new text as provided.

Note: this does not work with regexp replace, only plain text.

Change-Id: I87cbc28eb64688bdf3c8c6ec173fcb22f91abcd0
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-14 10:22:41 +01:00
Eike Ziller
a8a33b9a3b Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
2012-12-14 08:20:49 +01:00
Ray Donnelly
b06c38d4d7 Fix caplitalization for MinGW-w64 cross compilation.
MinGW-w64 cross compilation packages always use lower-case filenames.
library name "Ws2_32" changed to "ws2_32"
include name "Windows.h" changed to "windows.h"

Change-Id: I405f2e23c3f136961f66fc5e1d0d98f760c46e2c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-12-13 12:00:34 +01:00
Robert Loehning
0877f4e254 Squish: Sorted test cases in suite_general
Change-Id: I270606e8d9c89988102b5c2d37d345f33bd8da15
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 18:14:23 +01:00
Robert Loehning
9dd750c57a Squish: Update in tst_openqt_creator
Change-Id: I4055cf6485bd89e756d7aba5f9e3df17d91eedd6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 16:50:58 +01:00
Robert Loehning
27421b1a81 Squish: Check installed languages
Change-Id: I758381d67c431b4b7d6b7486f1d8561cf09c637b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 16:33:31 +01:00