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
hjk
7fec1199f3 Tests: Add a basic tree model iteration test 
Change-Id: I6b4dff0909e87ab727cb8c5b5be6f6c25b687bf0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-16 14:57:16 +01:00
hjk
4f6279256d Tests: Move auto/utils_stringutils to auto/utils/stringutils 
Change-Id: I475a5914f3b65656dc12cf7619bfed34e9fc8b74
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-16 13:32:41 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Orgad Shaneh
50a5056b10 Fix test compilation 
Change-Id: Iac9aa792c65c8d35b16ea23d9e20d909ef59eec6
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-01-16 08:06:30 +01:00
Robert Loehning
6ad3f3975c Squish: Update menu objects 
Change-Id: Id1c8ee441a8479aa2bd19410e88c4ea48d0ee3f9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-15 15:17:54 +01:00
Robert Loehning
9d9ec3a91b Squish: Load QmlProjectManager if needed for debugger tests 
Change-Id: Iffea74ffa8794b8c496987a4eb22ff76f181f55e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-15 13:06:40 +01:00
Robert Loehning
3476546717 Squish: Expect wrong path when adding file 
Task-number: QTCREATORBUG-13831
Change-Id: Ide335c00491a50ca8087fa07e27c0191e0d646b6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-15 10:11:48 +01:00
Eike Ziller
df3176d5e3 Merge remote-tracking branch 'origin/3.3' 2015-01-14 16:06:46 +01:00
Christian Stenger
4f1e9aa485 Squish: Re-enable testing of Pastebin.Ca code pasting 
Change-Id: I67f8d9705cd7b5063322e53fb3d745d0314b9fc0
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-01-14 13:38:48 +01:00
hjk
fdc260f14f Debugger: Work around clang limitation in auto test 
Clang 3.5 runs out of memory when trying to optimize
tst_Dumpers::dumper_data. So don't optimize.

This is a backport of 58c694577f.

Change-Id: Ia81aa6e491e132ee04bb51e9d443e836b5a7635a
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-14 11:07:00 +01:00
hjk
58c694577f Debugger: Work around clang limitation in auto test 
Clang 3.5 runs out of memory when trying to optimize
tst_Dumpers::dumper_data. So don't optimize.

Change-Id: Ic81aa6e491e132ee04bb51e9d443e836b5a7635a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-14 10:46:27 +01:00
Przemyslaw Gorszkowski
9e159d87a8 C++: display enum value in tooltip for simplest case 
If it is possible lets calculate enum value for the simplest case.
Example where it works:
enum
{
  enum_val1, // tooltip = "enum_val1 = 0"
  enum_val2 // tooltip = "enum_val2 = 1"
};

enum
{
  enum_val1=10, // tooltip = "enum_val1 = 10"
  enum_val2 // tooltip = "enum_val2 = 11"
};

enum
{
  enum_val1, // tooltip = "enum_val1 = 0"
  enum_val2=10, // tooltip = "enum_val2 = 10"
  enum_val3 // tooltip = "enum_val3 = 11"
};

Example where it does not work:
enum
{
  enum_val1=10+1, // tooltip = "enum_val1 = 10+1"
  enum_val2 // tooltip = "enum_val2"
};

Task-number: QTCREATORBUG-4529
Change-Id: Idd85ed7304018f73f2b068bf1ac28f1abde02f93
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-14 08:10:58 +01:00
Christian Kandeler
90a2665737 Generic highlighter: Fix autotest build for qbs. 
Change-Id: I2cae3d3256820f34d6d3bd7a8a9701c68cad1c53
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
 2015-01-13 16:04:40 +01:00
Orgad Shaneh
5a5acd664e Tests: Fix MSVC warnings 
Change-Id: If7f67ffc68ef725554e9ebaf8a8db5a64b7309cb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-01-13 12:08:13 +01:00
Nikita Baryshnikov
20e4f62eb3 Fix linker error in HighlighterEngine test 
Complains on highlighter.cpp:213: error: undefined reference to
`Core::MessageManager::write(QString const&,
QFlags<Core::MessageManager::PrintToOutputPaneFlag>)'

Change-Id: I296a105a8322e8b6ac1ab4a7085500f76acfcdeb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-12 15:22:11 +01:00
Orgad Shaneh
e62e47f0d0 Tests: Cleanup FileUtils test 
QTestData converts raw string as Utf8.

Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-01-12 12:03:37 +01:00
Robert Loehning
6e2782b8b0 Squish: Test first commit in git repo 
Task-number: QTCREATORBUG-12755
Change-Id: Idf27f4bc19ec62ce10ca9367e0b32b8d2b031587
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-09 12:16:21 +01:00
Eike Ziller
b5b47f7df2 Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
 2015-01-08 10:38:20 +01:00
Maksim Klimov
8276253558 TextEditor: Highlight and animate matching parenthesis for generic highlighter 
Change-Id: I78db37a91f1770513fcb5192bf45623799e14e34
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
 2015-01-07 12:38:59 +01:00
Christian Kandeler
1199a93fc0 qbs build: Make use of AutotestRunner. 
And fix some autotest project file problems uncovered by this.

Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2014-12-19 15:10:36 +01:00
Nikolai Kosjar
6cafc424e8 CppTools: Tests: Stop writing into source dir 
Instead, always write into a unique temporary directory in
QDir::tempPath().

Where applicable, read the test source from files instead of first
writing the file.

Some clean ups in test_codegen*.

Change-Id: Id48dc50c6ca16252edfd9fc8a86ba0de9f9be486
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2014-12-19 10:29:16 +01:00
Eike Ziller
487b05dba8 Adapt bugtracker URL 
Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
 2014-12-19 10:18:23 +01:00
Erik Verbruggen
242b3f4110 C++: clean up numeric literal parsing and add support for n3472. 
Separate the messy pp-number parsing from the numeric literal parsing.
The C/C++ preprocessor makes a grown man cry, but at least we have
"proper" literal parsing when we want it, including C++1y binary
literals.

Next step is digit separators (n3781).

Change-Id: Ia069eef454ed5c056f77694a5b8a595d0b76adc4
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2014-12-18 15:46:22 +01:00
Ulf Hermann
dac7e8644e Timeline: test TimelineAbstractRenderer 
Change-Id: I9860af4b6aedbd656103bf5def38f1830b1352e1
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-12-18 13:04:28 +01:00
Ulf Hermann
f0da74d35d Timeline: Streamline model implementations 
Allow models to be created without a parent and provide default
implementations for virtual methods. It's actually fine to have all
ranges in row 0 and in black by default. Having default implementations
makes things easier to test.

Change-Id: Ibb842ef295cdcfa13d8ca4be3489906af72e9699
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-12-18 13:04:09 +01:00
Ulf Hermann
7053378fdf Timeline: Complete test coverage of TimelineModel. 
Change-Id: If27c51b1189bc0bb0333837c58849bc79b779845
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-12-18 13:03:38 +01:00
Ulf Hermann
c40d9e9d17 Timeline: Create new library from contents of QmlProfiler 
Change-Id: I964b2f149e237eb25a08600e8dab8968e8bc0cb9
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-12-16 15:22:48 +01:00
Christian Stenger
f515a2528e Squish: Enable QmlProjectManager plugin for tst_qtquick_creation3 
Change-Id: Idaa2a603f5945a4df249f9b6ce606769a5c7ea74
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-16 07:19:39 +01:00
Nikita Baryshnikov
464cd2df71 Test TimeLineModel fix compilation 
after 516c0d6020

Change-Id: I2d2cdf0c899946f9bb792db2a10c12b03dfef4bc
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
 2014-12-15 16:27:06 +01:00
Robert Loehning
1be459d9dc Squish: Avoid error in tst_build_speedcrunch 
Change-Id: I2f199f392016005b8e00e48253838370628875d9
Task-number: QTCREATORBUG-13700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-15 16:25:04 +01:00
Nikolai Kosjar
e3977de08e C++: Finish gcc's include_next support 
This implements the actual include_next logic and thus completes

    commit b934cc1
    C++: pass #include_next down to CppPreprocessor::tryIncludeFile

    commmit 140b502
    C++: Highlight argument to gcc's #include_next extension

Based on https://gcc.gnu.org/onlinedocs/cpp/Wrapper-Headers.html

Task-number: QTCREATORBUG-10225
Change-Id: I7eef7f5ea64a114f6d092304d32b72c55c2ce134
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2014-12-15 15:37:36 +01:00
Christian Stenger
949a86f035 Squish: Fix tst_git_local 
Change-Id: I6acdaaf81a0b8c2523df4fda4ee7ec044da25678
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-15 15:24:30 +01:00
hjk
8815990903 Debugger: Fix std::unordered_* dumpers with GCC 4.9.1 
Change-Id: I5d5ed9cfc68af061970b0055b76cb563ca04ee53
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-12 13:54:37 +01:00
Eike Ziller
541d00453a Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp
	src/shared/qbs

Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
 2014-12-10 13:20:02 +01:00
Ulf Hermann
725623583f QmlProfiler: Separate expanded and collapsed row heights and counts 
We'll need to access both of them when building the scene graph. This
change also clarifies the dynamics between expanding categories and
row heights and offsets.

Change-Id: I2e2bf488ad973c95d05f230bf6fff63598f39bf2
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-12-05 14:15:15 +01:00
Robert Loehning
5ff6bbd4cd Squish: Test auto variables in tst_memberoperator 
Change-Id: I7b5bbdcfbd685abb5a716cc237276761065eb962
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-05 11:17:40 +01:00
Christian Stenger
64d6d64c93 Squish: Let test continue instead of crashing on protocol error 
Change-Id: I3c862d26fbbdf124c0b347225cfd97e0748a0830
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-03 12:09:29 +01:00
Eike Ziller
d341c48246 Merge remote-tracking branch 'origin/3.3' 2014-12-01 15:44:30 +01:00
hjk
8fdce7cdac Debugger: Disable QVariant(KeySequence) dumper for LLDB 
This triggers errors in LLDB
  error: main.o Parsing a die that is being parsed die:
      0x00001ddf: DW_TAG_subprogram operator void *QMetaObject::Connection::*
  error: main.o Parsing a die that is being parsed die:
      0x000100fa: DW_TAG_subprogram operator QObjectData *QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> >::*

Change-Id: Iae6a8ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-01 12:03:17 +01:00
hjk
bf9a3b2020 Debugger: Fix LLDB reference display for LLDB 320.x 
There is seemingly still no proper API for that, and
the old hack broke. Use a new one.

Change-Id: I9e638ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-28 14:55:03 +01:00
Nikolai Kosjar
2fc4acbc35 CppEditor: Avoid duplicate "Add #include XYZ" 
Task-number: QTCREATORBUG-13422
Change-Id: I3648bf44760fdac4e8e1e79652519136af6032c8
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2014-11-28 14:01:10 +01:00
hjk
315fb0372e Debugger: Add more reference related autotests 
Change-Id: Iae638ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-28 12:48:28 +01:00
hjk
9f272bcb8c Debugger: Also output dumper location in LLDB auto test 
Change-Id: I51a017ced91198bdc4e822cfcc1c45580945a773
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-27 07:09:34 +01:00
Eike Ziller
938326ef2c Merge remote-tracking branch 'origin/3.3' 2014-11-26 11:11:46 +01:00
hjk
42fc31bff7 Debugger: Require some clang version for clang specific test 
Change-Id: Ib6ba0ffb5957a60e700abd9a540bd7bbf5888b2a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-25 13:02:24 +01:00
Eike Ziller
a47fbb8309 Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
 2014-11-24 15:43:48 +01:00
hjk
1a1ec50801 Debugger: Adjust std::vector<bool> dumper autotest for recent Clang 
Change-Id: I1998f0750c5905a3dc4e83db297edc135cd2a39a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-21 15:12:11 +01:00
hjk
20675704c6 Debugger: Add ability to check for clang version in tests 
Change-Id: Ie56de7a0e59cadd8557f7a2fd00d434470000f3c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-21 15:12:04 +01:00
Ulf Hermann
10d942e268 QmlProfiler: Split AbstractTimelineModel in two classes 
We need a general purpose TimelineModel and a specialized
QmlProfilerTimelineModel.

Change-Id: I2da02d65efa11e160cab5fa9f8a21075beb0e2bf
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:03:58 +01:00
Ulf Hermann
af84726c51 QmlProfiler: fix autotest 
Change-Id: Ibe5e7638eb7f3d88ed02e6de12b81c9b2aba3e7d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:03:49 +01:00