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
Christian Stenger
88549467b0 Test: Fix filename offset tests on Win 
Change-Id: Id0cc5e4f23a8bd67b9ff1052d7fcabed92c192bd
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-04-03 12:48:05 +02:00
Eike Ziller
d68f14ad5b Merge remote-tracking branch 'origin/3.1' 2014-04-03 10:16:14 +02:00
Robert Loehning
dc66a01b10 Squish: Configure old Qt Quick projects with Qt 4 
Change-Id: I3a891ba8a3ca5d437c114a95fb1620a200261301
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-02 13:58:54 +02:00
Eike Ziller
cab8e4aa03 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
 2014-04-02 13:24:34 +02:00
hjk
43579c9bc6 Debugger: Switch off external python in tests properly 
Change-Id: Ic28cff5962b03e0a30c9c67526027b3e2799e738
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-01 16:20:08 +02:00
hjk
be8e9df588 Debugger: Fix new QDateTime offset test on Windows 
Change-Id: I12b31a41e55855ae99989e350075871a2dad4ef6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-01 15:30:38 +02:00
Christian Stenger
03a1361f59 Squish: Explicitly set wanted kit 
Change-Id: I287ce12a040a81a6392f39385c5a0c26d53b8e28
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-01 12:05:04 +02:00
Orgad Shaneh
aeb2cfbc4f CppTools: Fix indentation for concatenated strings 
Change-Id: I801a56804e7873be75a9ebc085dc3f4a2d64ea35
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-03-31 18:18:42 +02:00
Przemyslaw Gorszkowski
5416557a0b C++: fix findusage for member of typedefed anonymous struct 
Task-number: QTCREATORBUG-11859
Task-number: QTCREATORBUG-11860
Change-Id: I7484b3b88daefbb3c76bb86a9b573e8291072872
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-03-31 18:16:52 +02:00
Christian Stenger
480c652836 Squish: Fix expected target 
Introduced with e08f5044ae.

Change-Id: I81332377cd2bcd94c06c6b94b1750228172aa1f3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-31 11:35:05 +02:00
Christian Stenger
672a2c4ea6 Tests: Remove plugin dependency 
Change-Id: I53efe07ff4ac07c7c13a93c5fe1656a966337c12
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-28 16:51:48 +01:00
Christian Stenger
2a60412a63 Tests: Fix filename offset test for 32bit 
Change-Id: I5b16696cc8256a1eb6504c3aa8bb546d4a31bca1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-28 14:16:59 +01:00
hjk
a9a3f0e306 Debugger: Add offset test for QDateTime 
Change-Id: I08d4023eee9c3af02e448f8bed41dba61d8b0989
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-28 14:16:06 +01:00
Robert Loehning
e08f5044ae Squish: Make Qt 5.2.1 the default kit 
Working around:
Task-number: QTCREATORBUG-11519

Revert asap

Change-Id: I4a96017f87019250ba4b9311e1a6b83802c43418
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-28 13:36:34 +01:00
Robert Loehning
05339a53e9 Squish: Handle Quick UI not starting 
Happens with Creator built on Qt 4.8.5 trying to run a Qt Quick 1.1 App

Change-Id: I5f83fb26e6ac43daa9ea61af5498b81498476668
Idea-by: Christian Stenger
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-28 10:18:26 +01:00
Robert Loehning
9759d3bacb Squish: Fix modifyRunSettingsForHookIntoQtQuickUI for multiple kits 
Change-Id: I3d42920edba4a750c27714d26c9143e48c17fd39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-28 10:18:06 +01:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
 2014-03-27 18:20:00 +01:00
hjk
dbda90ca15 Debugger: Also show unmodified output for failing dumper tests 
Change-Id: I1e06db52d0d7bea3ab626ad21b970d0fdfe28648
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-27 16:50:29 +01:00
hjk
fdf39819df Debugger: More verbose test output in case of failure 
Change-Id: I41d9b634be850bfbc666c1a929b0f82b7f741069
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-27 15:39:34 +01:00
Christian Kandeler
c18922a349 Replace deprecated construct in qbs files. 
"{in,out}put.fileName" -> "{in,out}put.filePath".

Change-Id: Icf55489cdf2187f9f1a6f413054af1fba8025f4c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-03-27 13:57:53 +01:00
Christian Stenger
e0aa74dc1a Squish: Improve workaround for tst_QMLS04 
Change-Id: I2be9ac44e02287362e7aeab4927645fbbcf38c64
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-26 21:20:06 +01:00
Przemyslaw Gorszkowski
6bf75acac7 C++: fix support for nested anonymous class 
The case when anonymous class is inside function. Fixed:
* highlighting
* completion

Task-number: QTCREATORBUG-11711
Change-Id: Ic8fc5fdfb1aed62a74bf148ab7ed449d08214dda
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-03-26 09:56:54 +01:00
Robert Loehning
5d40776037 Squish: Don't expect branches in "git show" 
List of branches was disabled becaused it needed too long.
This feature might return in master

Change-Id: I065f2843f5b7328e0208e5bdcb7663dc8f8873fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-25 17:26:49 +01:00
hjk
5f16194870 Debugger: Add test for dynamic QObject property dumper 
Change-Id: I3216a8f891b76a5e9d342aa97540fcb73c590531
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-25 16:59:15 +01:00
Przemyslaw Gorszkowski
e3f5977311 C++: nested class in function 
Case when nested class declaration contains object name for this class.
Example:
void fun()
{
    struct S
    {
        int i;
    } s;
    s.i;
}

Fixes:
* highlighting
* completion
* tests

Task-number: QTCREATORBUG-11710
Change-Id: I32e234f57655c388a87a199edc8be750d7bf823f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-03-25 15:52:39 +01:00
Dave Lewis
a8c858acdd CppTools: Fix indent after ">>" in return type 
Add case for ">>" token in declaration_start state to prevent
falling through to stream_op.

Task-number: QTCREATORBUG-9199
Change-Id: I53710be55eff4574de89f9159e95bbc1de2ba34e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-03-25 15:33:32 +01:00
Dave Lewis
5510ec0552 CppTools: Fix indent after template params 
Add case for ">>" token when in template_param state.

Task-number: QTCREATORBUG-9640
Change-Id: Icc5fc868202d6503d2afd954aa739cd2634cdff1
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-03-25 15:29:08 +01:00
Christian Stenger
13468fc1b8 Squish: Add workaround for tst_QMLS04 
Additionally added user-defined exception to JIRA class for
usage inside workaround functions.

Change-Id: I1f6c6c269dd93e00f69741af36c4de3324693da9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-25 12:58:04 +01:00
Christian Stenger
aff40bd187 Squish: Provide fallback for tst_HELP02... 
...when running on build machine inside Jenkins.

Change-Id: I184ff013b1743b9f50cd0a2ac0ef76071b4336a3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-21 16:20:33 +01:00
Christian Stenger
4175dc66ec Test: Fix tst_offsets for Qt5.2.0 on 64bit 
Change-Id: Ie4650820702a83ffb2ca968304babb39084ec3c5
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-21 15:33:49 +01:00
Christian Stenger
79497e7fae Squish: Fix Qt Quick 1 related tests 
qrc files are now used in Qt Quick 1 template as well.

Change-Id: I7b7541d16100285893587605bb1b4130277b72e4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-21 12:56:18 +01:00
Christian Stenger
1b6b0b9506 Squish: Stabilize tst_default_settings on Mac 
This also reverts 1605b788e6.

Change-Id: I45b1b856eb6bd0acba43a10866faf2a9726aaa54
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-20 15:43:10 +01:00
hjk
06fbcde58b Debugger: Add offset test for QObjectPrivate::extraData 
Change-Id: Ie1adc3d1d1c60b6f08b734cbe85455f1ba10de89
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-20 15:01:25 +01:00
Christian Stenger
8a6b6c7cba Squish: Avoid AUT crash in tst_qml_outline 
Change-Id: I93e8c0050dba4f0acb7b02eeeb5a0dfdddf9d02d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-20 13:05:54 +01:00
Christian Stenger
6ca680ac1f Squish: Fix tst_git_clone 
Some objectNames had been removed.

Change-Id: I5c3d405a623cbd894c7df79ce44ac05013049d3d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-20 13:05:22 +01:00
hjk
e9a2e4569b Debugger: Fix QXmlAttributes dumper for LLDB 
Change-Id: I456424161cc80acc4057a56f62af5d33acf2eef7
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-19 19:01:02 +01:00
hjk
41e47513b8 Debugger: Disable QStandardItemModel dumper test for LLDB 
The dumper is far from portable, make the test pass for now.

Change-Id: I52cdd8e5c73d21d837772be83087dc065698db30
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-19 18:48:38 +01:00
hjk
d343641b9a Debugger: UseDebugImage for QDir dumper test 
Should work without, but doesnt with LLDB.

Change-Id: I32cdd8e5c73d21d837772be83087dc065698db30
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-19 18:48:20 +01:00
Robert Loehning
b442a02602 Squish: Generalize stabilization of tst_CSUP04 
Change-Id: Id56420161cc80acc4057a56f62af5d33acf2eef7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-19 17:20:48 +01:00
Christian Stenger
edf7557749 Squish: Fix and improve __selectQtVersionDesktop__ 
Change-Id: I05e0038f8baf134e6d01d829bd52812b9128dd60
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-19 17:19:12 +01:00
Christian Stenger
d1b412ced2 Squish: Add workaround for tst_HELP02 
Change-Id: I61307ccd86246cdbe131f89e13521be8942c22a1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-19 17:05:07 +01:00
hjk
bf593e3f04 Debugger: Adjust a few autotests to work with LLDB 
LLDB doesn't find const[] in the function, since this
is not what the tests are supposed to check, dropping
the const is simpler than using backend specific checks.

Change-Id: Ifad1a57a3112b7cc5e86865e0035bab35cf5523d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-19 09:36:21 +01:00
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
 2014-03-18 14:46:29 +01:00
Tobias Hunger
a5a42c3f67 Vcs: Prettify output in CheckoutProgressWizardPage 
Handle CR in the output of the VCS we are running in the checkout
wizards. This makes sure we get proper progress information when
running the checkout operation.

Note that this is not a perfect implementation: It will fail when
e.g. only a number at the start of the line is updated and the
rest of the text in the line is reused.

Task-number: QTCREATORBUG-10112
Change-Id: If742e5cb945a2fcada8319d08610d1ccc7fa2ae8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-03-18 13:34:29 +01:00
Christian Stenger
1605b788e6 Squish: Handle sporadic missing visibility on Mac 
Change-Id: I7e2694ced72ee836ad6c532f642914d802acb0c2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-18 12:14:00 +01:00
Robert Loehning
9d97880037 Squish: Trying to stabilize tst_CSUP04 on Mac 
Looking at the screenshots, fails might be timing issues.

Change-Id: Ia17b766e332370b3392161d79c774d94f3c1b790
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-17 16:22:20 +01:00
Robert Loehning
823fafc17e Squish: Improve verification of git clone log 
Change-Id: I7f1ae5f9b483a97266358d71c545b157e743e853
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-17 14:15:47 +01:00
hjk
1910fe9175 Debugger: Add dumper for boost::container::list 
Change-Id: I251a859ca63bf932cb0d22ef11b5492b75ebcadd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-14 16:17:29 +01:00
Christian Stenger
c3a23cb862 Squish: Rewrite checkQtCreatorHelpVersion() 
Change-Id: I994379476ab52df75a4a34a8e0db025ee2f3df70
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-14 08:02:52 +01:00
Robert Loehning
b071a0ad07 Squish: Update tst_git_clone 
Command line information appears in Version Control view,
not in the dialog anymore.

Task-number: QTCREATORBUG-10531

Change-Id: Ib3a501e32d6105a78d8e4f4f1ad019de22e3ef3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-13 19:23:51 +01:00