feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,551 Commits 108 Branches 368 Tags
e64d0b5a39d6b1695cba5f5d64c6a5eb3cb15be3
Commit Graph

1314 Commits

Author SHA1 Message Date
Orgad Shaneh
e9aaf21517 Centralize addition of plugin library paths 
Change-Id: I9ddcc193b4d927c3d566eeb81c41f79a75920696
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-05-08 15:29:21 +02:00
Orgad Shaneh
6aad96d89b Nuke plugins PROVIDER settings 
Place all plugins in lib/qtcreator/plugins

Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-05-08 15:29:11 +02:00
Christian Kandeler
5c9f175133 qbs build: Make the autotest template available as an import. 
Just like for QtcPlugin, QtcLibrary etc.

Change-Id: I395f5863f31abba589864be3ad41ad7fc893787f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
 2014-05-08 11:01:44 +02:00
hjk
84f1fcc773 Debugger: Show raw opcode bytes in disassembler view 
Change-Id: I420dd5e9af4a92c84d53dbd52837be8f84440995
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-04-30 15:18:38 +02:00
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
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 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
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
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
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
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
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
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
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
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
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
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
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
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
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
hjk
87c4799a8a Debugger: Loosen version restriction on CComplex test 
Change-Id: Ifc2b2e5fb51b4e1bd1b55d7d7ab9e5b3083d0da1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-12 15:05:30 +01:00
hjk
11ea9fb976 Debugger: Ignore Clang debuginfo quirk in auto test 
One more pass on Mac...

Change-Id: I3370040879abf948be8594dec4bf267978329bbb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-12 15:01:48 +01:00
hjk
4a9796307b Debugger: Adjust auto test to protocol changes 
Change-Id: I5cdf8f8c8a28b95fe29eddff9d8db8a0652847d2
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-12 14:34:25 +01:00
Przemyslaw Gorszkowski
376f77952e C++: fix support for nested anonymous classes 
A member of nested anonymous class should be visible as a member of
enclosing class(if there is no declaration of this nested anonymous
class).

Fix:
* marking
* find usage
* follow symbol
* completion

Task-number: QTCREATORBUG-10876
Task-number: QTCREATORBUG-11170
Change-Id: If5b4d198e9075f2a8aa899ae59190f2c05f7b1ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-03-12 14:07:58 +01:00
Oswald Buddenhagen
52bf71fbdf Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
 2014-03-11 13:39:55 +01:00
David Schulz
69ea24b011 Debugger: Fix a bunch of dumper test for the cdb. 
Change-Id: I852f235cdb24086964b07869b9435f9e61fbb38b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-11 10:47:07 +01:00
Christian Stenger
cc96d02a41 Tests: Extend tst_offset 
Change-Id: I451502e3dc99bf80e2eb540795f04ea7f8a3439f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-10 17:57:32 +01:00
Christian Stenger
5377b1497f Tests: Fix for using non-developer-builds of Qt 
Change-Id: I7204637c0c8dc145331d4097c62ab4fb962fe204
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-10 10:04:27 +01:00
Christian Stenger
0cb3e81015 Tests: Compile fix for Qt4 on Mac 
Change-Id: I17bad7e03a45f372d8c5ad08d8dbefe3797f227c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-10 10:01:06 +01:00