feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
76,958 Commits 108 Branches 368 Tags
bf0d716b51c9eb78076f402e60e68acd4858ee7f
Commit Graph

6972 Commits

Author SHA1 Message Date
Robert Loehning
49adb78ec9 Squish: Fix tst_create_proj_wizard 
Change-Id: Ie4fb69873edb8be5cfb0e82a920cb90e822f6a7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-09 11:27:31 +02:00
Christian Stenger
fe8d426e10 Squish: Fix killing of left-overs on testing machines 
Change-Id: Ia7bbc5c1eb3d854343717349d8800a3fb14e3e20
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-06 15:00:08 +02:00
Oswald Buddenhagen
a4d714e23d Merge branch '2.8' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	tests/system/shared/project.py
	tests/system/suite_general/tst_create_proj_wizard/test.py

Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
 2013-09-06 12:20:44 +02:00
Nikolai Kosjar
551b18f304 C++: Tests: Fix tst_Semantic::lambda_2() test 
Change-Id: Ie405a9339d13615efb1113614a7dcd7069849b4f
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-09-06 09:58:02 +02:00
Robert Loehning
c77c392cb9 Squish: Trying to stabilize tst_SCOM01 
Change-Id: I895d763fdee4b15a36e109ee9f46d84635afa6a0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-05 17:47:38 +02:00
Robert Loehning
f7c67d5521 Squish: Add test case for git clone wizard 
Change-Id: I4b4415d8a9b40b16be609286f0f07a63c4dd88bc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-05 17:44:50 +02:00
Christian Kandeler
f6e2cfc2af Autotests: Add some helpful output on failure. 
These turned out to be useful when investigating test failures.

Change-Id: I2e588123dba84bfdfa1094d70bc604e7dfca02ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-05 15:55:29 +02:00
Christian Kandeler
e5c7ac61ec ExtensionSystem: Add missing check to autotest. 
There was no check whether the plugins to be examined actually existed,
meaning the autotest would erroneously succeed if they were not at the
right location.

Change-Id: Icd230ad7ecac9852a4ba0887e278fe9e098d084b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-05 13:16:30 +02:00
Orgad Shaneh
adee8336bb C++: Custom directory list for Switch Header/Source 
Some projects use separate directories for sources and headers.

An example tree:
*
|-- src
     |-- foo.cpp
|-- include
     |-- foo.h

Allow the user to specify directories for finding out-of-project related
header/source files, in addition to current directory

Task-number: QTCREATORBUG-8883
Change-Id: I57215c8f2feffcc246d0d161798290861bcfcdd4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-09-03 14:25:05 +02:00
Robert Loehning
fd08c7e6e8 Squish: Fix failure message 
Change-Id: I77f46ccc87fe0ae64fcab17c35af93c6064dc9f4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-03 10:45:51 +02:00
Christian Stenger
81d9d9126f Squish: Test for debugging empty main for Qt/C/C++ 
Change-Id: I774a610b1dab5b4db4f62ff267084aad9095d3a7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-02 10:06:08 +02:00
Nikolai Kosjar
b4a121a90a CppTools: Ignore generated symbols in SearchSymbols 
...e.g. qt_metacall() etc from the Q_OBJECT macro.

This affects the results of the cpp locator and find filters.

Change-Id: I2f9ff1210f3705baddadd486d700ee8be9a44a20
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-08-30 14:39:08 +02:00
Christian Stenger
8ff61e3036 Squish: Enable Qt5 for suite_qtquick test cases 
Change-Id: I84caf3b4c47badcf444242b6fbc52090ccb5680a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-30 14:37:54 +02:00
Christian Stenger
1cecc5b0f7 Squish: Make sure current documentation is loaded 
Change-Id: I6d45ce482de3f61a14953bbb7714b1293aa2459b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-30 14:37:36 +02:00
jkobus
86f9a2b7e6 Fix generic highlighter autotest 
Change-Id: I35994a8c29374edfeb8a230af10c2a3277232f22
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-08-30 14:19:37 +02:00
Christian Stenger
2a2ecdc323 Squish: Prepare enabling Qt5 for suite_qtquick 
Change-Id: I7c4ac62be8f30867953f776ad56ab3ffbf6cd909
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:11:01 +02:00
Christian Stenger
2665eced9b Squish: Move common function to shared script 
Change-Id: I59d341f9f7a5c86bc3b723dbdc1e1596d464c92c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:45 +02:00
Christian Stenger
cdf8407d67 Squish: Fix determination of available targets 
Change-Id: Iff01b44058dd9175aacfb0a0da96f35fb32383e7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:32 +02:00
Christian Stenger
4fc9302c56 Squish: Move common code to shared file 
Change-Id: I5e268d6faf9a2a5a779e850667c582328c42387d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:14 +02:00
Christian Stenger
4c0778786b Squish: Build Qml debug lib only if necessary 
Change-Id: I90cf1f9e57d39211ea151b1cfc52e27f4ecaf654
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:09:58 +02:00
Nikolai Kosjar
a06da47d5b Locator: Allow to filter for path in BaseFileFilter 
If the input contains a path separator, the input is matched against the
file path. Otherwise, as before, the input is matched against the file
name.

This affects AllProjectsFilter, CurrentProjectFilter and
DirectoryFilter.

Usage Examples:
    "src/*main.cpp"
    "cppedtior/"

Change-Id: I8bc55642b388a8f8e1d7a949f80bbe1abc41ae3c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-29 08:27:53 +02:00
hjk
853fcf3c43 Debugger: Auto-test compile fix with Qt 4 
Change-Id: I414e829214a6e2e306998230aafde1a75c0af857
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-28 16:16:48 +02:00
Robert Loehning
769788a452 Squish: Remove outdated workaround from tst_codepasting 
Change-Id: I62d236ad691c878a324a307d3e9b1ce6c183966a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-28 11:03:20 +02:00
Christian Stenger
4433f7aadd Squish: Enable running on Qt5 
Change-Id: Id74f1f2162542cbac98f86bc0c0b049334cdf035
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-28 09:21:34 +02:00
Oswald Buddenhagen
4855871607 Merge remote-tracking branch 'origin/2.8' 2013-08-27 10:48:08 +02:00
Christian Kandeler
525a9f6a03 Diff editor autotest: Fix compilation with namespaced Qt. 
Change-Id: I2effb0c94c9590e57c5d49ed285640dcd3a95727
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-08-26 18:03:22 +02:00
Christian Kandeler
eecacbfbfe CPlusPlus: Some compile fixes for autotests. 
Change-Id: Id2ced5e41686387e67a7bb8419fe1547b23779c7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-08-26 17:45:54 +02:00
jkobus
e8801167aa Add common interface for text formats inside syntax highlighter 
Change-Id: I87f64446161a57aea0896f68e4eafacef791969b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-08-26 13:39:40 +02:00
Thiago Macieira
62fb22278c Debugger: Add dumper support for IPv6 in QHostAddress 
Change-Id: Ia542cf9e3c695a2c3c4b6340c3d72dfe743339c6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2013-08-23 21:36:39 +02:00
Robert Loehning
6ac27c9635 Squish: More output from HELP02 to investigate fails on Linux 64 
Change-Id: I5bb7290970039e8629ec8aae7115c850874654c1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-22 16:43:01 +02:00
Robert Loehning
8f19fd60de Squish: Evolution of tst_codepasting 
Change-Id: Ia234672077e71caa02b7823555003750508fa828
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-22 14:58:33 +02:00
Nikolai Kosjar
a4337db4ab Designer: Fix "Go to slot..." for project-less "Qt Designer Form Class"es 
Task-number: QTCREATORBUG-9653
Change-Id: Ia50c295ee474d08b3fb0574a4f759a8ab901876a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-08-22 12:05:02 +02:00
Nikolai Kosjar
2555c21158 C++: Tests: Reset diagnostic messages 
...otherwise they add up and subsequent tests checking for the error count will
fail:

FAIL!  : tst_AST::objc_try_statement_1() Compared values are not the same
   Actual   (diag.errorCount): 5
   Expected (0): 0
   Loc: [/home/nikolai/dev/creator/qtcreator-master/tests/auto/cplusplus/ast/tst_ast.cpp(1400)]
...

Change-Id: I8b4356331e95dceb1e99bb26e6ebf4591d70a08c
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-22 10:10:15 +02:00
Erik Verbruggen
c2d2173934 C++: Add parser support for @throw statements. 
Change-Id: I366733ec821ee264f182f4d4a3cf69cdada20cfc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-08-21 15:33:39 +02:00
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
 2013-08-21 14:39:18 +02:00
Robert Loehning
01b3e1fa54 Squish: Fix __startDebugger__() 
Change-Id: I1f87346ad12f4a6e749042b3c1bcabbc71bdbf7a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-21 11:01:42 +02:00
Nikolai Kosjar
d185849150 CppTools: Tests: Introduce basic BuiltinSymbolSearcher tests 
Change-Id: I25f11e80747863f797d146980d8ee0e605acb6e5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-08-20 14:18:45 +02:00
Przemyslaw Gorszkowski
3256b7b2ef C++: fix matching type with using from other namespace 
example code:
struct S { int s; };

namespace std
{
    template <typename T>
    struct shared_ptr
    {
        T* operator->();
    };
}

namespace NS
{
    using std::shared_ptr;
}

int main()
{
    NS::shared_ptr<S> p;// for this shared_ptr
    return 0;
}

Fixes:
* find usages
* follow symbol
* highlighting
* marking

Task-number: QTCREATORBUG-7978
Change-Id: I28994c960b87ddd400e1d7b860fca6c6683bbb5a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-08-20 14:13:19 +02:00
Robert Loehning
9a3e999f97 Squish: Add test for codepasting 
Change-Id: Icba9a10d0269353f7b11e341ffa62ca78593cf2f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-19 16:57:51 +02:00
Nikolai Kosjar
dcf618469d CppTools: Tests: Add basic tests for locator filters 
Change-Id: Ie71aa8a39f4584a024a4f104841ad8e57947e489
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-19 14:43:58 +02:00
hjk
e84f7f33a6 Debugger: Disable inapplicable context menu entries for sub-breakpoints 
Task-Number: QTCREATORBUG-9984

Change-Id: Id4197b8d0db917606eb0e2767d2b05195e6cfbcd
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-19 12:45:43 +02:00
hjk
8c12b2bf73 Debugger: Adjust auto test runner to manual testing needs 
- Don't remove temp stuff when QTC_KEEP_TEMP_FOR_TEST is set, even
  if the test passes.
- Heed QTC_USE_GLIBCXXDEBUG_FOR_TEST to enforce compilation with
  -D_GLIBCXX_DEBUG to trigger a way to test the full-debug version
  of g++'s standard library

Change-Id: I5bf9f423835883349af3ce772e900e0a2123c69e
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-16 14:37:43 +02:00
hjk
958a1d2d4e Debugger: Implement dumper for std::unordered_{set,map} 
Task-number: QTCREATORBUG-9855

Change-Id: I985745530d93e1c191442431a7a9449a1c4c059a
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-16 11:11:21 +02:00
Nikolai Kosjar
8ea14767af CppTools: Rework handling of ProjectInfo changes 
(a) The code model manager figures out by itself which files were added
    or removed from the project.

    If this was done successfully, check also the timestamp of the
    common files and reindex if necessary.

(b) A full reindexing is only triggered if the project configuration
    changes (defines, includes, framework paths).

(c) If project files were removed, the garbage collector is called.

Task-number: QTCREATORBUG-9730
Change-Id: Ib855614b070880576233a3525813617c967a72f3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-08-13 14:13:33 +02:00
Robert Loehning
af8a95d1fc Squish: Added test for external sort tool 
Change-Id: Iacc1be6b3c1c16628948a744338eaae82c566015
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-13 11:58:14 +02:00
Christian Stenger
a932c6ebca Squish: Improve invokeMenuItem() 
Change-Id: I977a9465a944f30fc195e6072f50b663f5d4d24d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-13 09:23:34 +02:00
hjk
e2aa5b53cf Debugger: Add dumper for QIPv6Address and Q_IPV6ADDR 
Change-Id: I85d8a484fdc3a265aa736d6a2f38ff955af8e138
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-12 12:41:57 +02:00
Orgad Shaneh
578d18691a SynchronousProcess: Replace last QByteArrays with QStrings 
Matching \n in a QByteArray is wrong. For example, it detects Ċ (U+010A)
and ਛ (U+0A1B) as end-of-line

Change-Id: I9c03d0b19da3d328e706ff2c89f09713be870f34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-08 11:15:59 +02:00
Tobias Hunger
07d486ce94 PluginManager: Do not use instance() when that is not needed 
Change-Id: I68e1b20561098c375557be6db1fb528e0ae040f6
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-02 11:52:40 +02:00
Christian Stenger
cd30b00a54 Tests: Compile fix for dumper test using Qt4 on Win 
Task-number: QTCREATORBUG-9719
Change-Id: Ie4024a8c08e0612e3c37888c7bc45415922228af
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-25 15:48:55 +02:00