feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
71,185 Commits 108 Branches 368 Tags
e3acfcbe60b51125f29dfb72a389d34cb2142688
Commit Graph

6441 Commits

Author SHA1 Message Date
Christian Kandeler
f170f9edf8 Fix autotest build for qbs. 
Change-Id: I0aeb4020b4a761adce1da72e37aade6e0b69327b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-04-29 14:14:45 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines. 
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-04-22 10:06:40 +02:00
Robert Loehning
6827072fac Squish: Stabilize tst_external_sort 
Change-Id: I4c580c160f1035ed04ec2b1d1fc9e0c79f8813fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-16 17:06:20 +02:00
Eike Ziller
8c1c106a4f Merge remote-tracking branch 'origin/3.1' 2014-04-14 16:53:23 +02:00
Christian Stenger
e6f868572d Tests: Fix wrong braces 
Change-Id: I42be43ece7b8791e4299776f86fc3d9740ecffb8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-14 16:36:28 +02:00
Christian Stenger
7bce07f192 Tests: Fix profilewriter test 
Change-Id: Id3bb7e80baa5f26d1b76fb85d19fcb45a0595b05
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-04-14 15:17:24 +02:00
Christian Stenger
a0e3c97bf4 Squish: Handle rpc failure 
Change-Id: I90669dac9de394e2d80be1a689b3b8b443296942
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-10 13:17:38 +02:00
hjk
4b4181a9cd Debugger: Handling eigen3 in manual test 
Change-Id: Id3e6eddffe8d0edd7d5947c2eec03d707bd2436b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-10 12:19:24 +02:00
hjk
13a4f739ef Debugger: List QObject methods and signals in dumper 
This mostly re-activates code from the old code path
in the QObject dumper.

Task-number: QTCREATORBUG-11997

Change-Id: Ie3e6eddffe8d0edd7d5947c2eec03d707bd2436b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-10 10:55:15 +02:00
Robert Loehning
8eefc34419 Squish: Update paths to QML files 
Reaction to 96367b6253

Change-Id: I9651f9cac2b6c48158fa9094ef86ef04460e8a16
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-08 16:44:23 +02:00
Christian Kandeler
49ae4ec538 Fix qbs build on Windows. 
Change-Id: Idc471dd4a9734f71e615532a4d70225435452d27
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-04-08 13:38:05 +02:00
Eike Ziller
5ba6fc0195 Dumper tests: Use lldb from /Applications/Xcode by default on Mac 
Change-Id: I1974a6ad63a914d860fa99e55cf0162774ab7b07
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-08 11:43:36 +02:00
Eike Ziller
b687658663 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521
 2014-04-08 11:18:40 +02:00
hjk
780c21a1c3 Debugger: Make autotests runnable with MinGW 
Change-Id: I0bdeadbad547b8351f3e1521c269e882a46edcb9
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-07 16:57:30 +02:00
hjk
161a1eb3ae Debugger: Compile fix in manual test for latest Qt base 
The #define COMMA trick doesn't work anymore after the
latest Q_DECLARE_METATYPE changes.

Change-Id: I15cfc7387d8e5329b588d6d841cd9c2322270363
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-04-07 10:25:17 +02:00
Christian Stenger
bc4dadd6c0 Tests: Fix fileName offset auto test on Win 
Change-Id: I7eae2ffbee284720b23c33c353a2a0aaae0a11f5
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-04 15:39:38 +02:00
Robert Loehning
92239b6753 Squish: Verify elapsed time from QML Profiler 
Task-number: QTCREATORBUG-11952
Change-Id: I1ef4b5ec7dfcf56cb7c07882b8e091fd84b26121
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-04 15:05:46 +02:00
Christian Stenger
0369e2a114 Squish: Remove workaround 
QTCREATORBUG-11548 has a quick fix now.

Change-Id: Ia9f38f58bf5d11d5ece4779fd7527fbf8ae65fb1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-04 12:18:00 +02:00
Przemyslaw Gorszkowski
df5d9f99fb 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>
(cherry picked from commit 5416557a0b)
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-04-04 12:07:06 +02:00
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