feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
54,723 Commits 108 Branches 368 Tags
41df91ece8e2d88fabbaf00b2074b810ba93b51a
Commit Graph

4883 Commits

Author SHA1 Message Date
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
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
Christian Stenger
03fd61ff08 Squish: Fix tst_rename_file 
Change-Id: I71eece2ce9d73132edc09c5ba1465882636f5c78
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-11 15:42:46 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files 
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-03-11 14:20:22 +01:00
Christian Stenger
9637e65698 Squish: Fix tst_simple_analyze 
Used template has changed - correcting the expected values.

Change-Id: I8d60f3c75f1f88d80c31f68276ac083e2215e8f7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-11 14:20:17 +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
Joerg Bornemann
01715c6172 use the .qbs file extension for qbs project files 
Change-Id: I4a6a8a81ca687b29101ae66ed22a2456e8991d55
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-03-11 11:32:06 +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
e2b8ef4592 Squish: Avoid Squish crash in tst_rename_file on Mac 
Change-Id: I51b16970504d85eed63cf0ddd7b0ff07b6226273
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-10 16:03:35 +01:00
Christian Stenger
1b7de8c37c Squish: Fix detection of clang++ on Mac 
Change-Id: I02f68f7942a3774c686e1482d275e22a6037af2a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-10 16:03:27 +01:00
Christian Stenger
87abfc3624 Squish: Limit suite_CCOM to Qt4 kits 
Change-Id: I49016d432221f39bc525fa4a548968294f139976
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-10 15:57:52 +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
David Schulz
0f6846bdaf Debugger: Simplify the cdb output parsing in dumper test. 
Change-Id: I5390e6514947002ddefcfe1fae36db5201749f1b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-10 07:39:25 +01:00
hjk
0543ad2199 Debugger: Fix mixup of {hexa,}decimal in auto test 
Change-Id: I447bf58458540acc8ff901967a190c9f42961a6b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-08 00:02:43 +01:00
hjk
dbc474ef71 Debugger: Speed up Qt namespace extraction with GDB 
Change-Id: Ic2a1296828d5aceb6c0aae0edbd165e3d0e86741
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-07 17:59:18 +01:00
hjk
944d0bfa8e Debugger: Show Qt version in a more readable way in autotests 
Change-Id: I3983be6a5cb5ab85ae0f5d116f055d1c858809f5
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-07 16:32:34 +01:00
Robert Loehning
d007c50045 Squish: Reworked tst_qml_indent 
- updated line selected for changed template
- added xfail for indented empty lines
- using automatic removal of blanks when saving
- made global variable local

Change-Id: I87205c69652f236767d6551b96bfd7960f39a02e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-07 13:54:01 +01:00
Christian Stenger
8f61967587 Squish: Fix openDocument() for new qrc approach 
Change-Id: Ib0809955339b97de7000d015830e4d13c3d66b62
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-07 13:50:45 +01:00
David Schulz
914f978da2 Debugger: Fix dumper test when inferior runs under wow64. 
When the inferior runs under wow64, DebugBreak throws a wow64 breakpoint.
These has to be ignored because they are also thrown on every 32 bit library
load. To make sure the debugger breaks DebugBreak is replaced by a null
pointer dereference.

Change-Id: I0c0985558da1c355c1fc62a2fc5f736e54e843ce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-07 10:22:18 +01:00
Robert Loehning
90dc3fec6d Squish: Fix tst_simple_debug after change of file template 
Change-Id: I44a8450ae089c14aac8911d6e3c5802b497d9044
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-06 15:38:14 +01:00
hjk
fafff16ce3 Debugger: Add auto test for private offsets 
Change-Id: I45e8593c492814100ddd36fa5269d6435941ad47
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-06 15:12:10 +01:00
Christian Stenger
521bb9156e Squish: Use Qt5.2.1 kit if possible 
Change-Id: I674c100e12c5553c2cee36ea2d78ba4e6f61a299
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:35 +01:00
Christian Stenger
8ef14e0ccc Squish: Add Qt5.2.1 and kit settings for Win 
Change-Id: I8805c9d7e687cf19525075b41f080857edd452d9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:29 +01:00
Christian Stenger
6db68e6c73 Squish: Add Qt5.2.1 and kit settings for Mac 
Change-Id: If38f9835da2839f40ef7ed3d3c9542d974a2a9dd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:22 +01:00
Christian Stenger
5ac7b0d518 Squish: Add Qt5.2.1 and kit settings for Linux 
Change-Id: Ice81f6f29d769296c356e3fc8472d327b5b09a3b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:16 +01:00
Sergio Ahumada
c375436847 Fix some typos 
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-05 09:39:42 +01:00
Eike Ziller
3ba9db48ed Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
 2014-03-04 14:04:07 +01:00
Christian Stenger
0f1105d8c1 Squish: Add workaround for mixed debugging bug on Mac 
Change-Id: I4634a10d06ff30998787a215886b642d8349bb8f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-03 13:13:34 +01:00
Christian Stenger
888d752392 Squish: Support Debugging Tools for x86 as well 
Change-Id: Ibf508de48473a48d0a88356d15a06088873a3d9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-03 11:43:56 +01:00
Christian Kandeler
c8881e7ca2 Support configurable library location in qbs build. 
And also in the qbs sub-project (for the qbs and qmake builds). This
becomes possible with the qbs submodule update that is part of this
patch.

Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-02-28 17:38:41 +01:00
Robert Loehning
23e9338e97 Squish: Enable QML debugging in doSimpleDebugging() 
Change-Id: I46a902a8038beac49e70a8a1f422c079bd2b3f44
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-28 15:34:48 +01:00
Eike Ziller
92e930b367 Merge remote-tracking branch 'origin/3.1' 2014-02-28 13:53:42 +01:00
Robert Loehning
c8027974ca Squish: Update expected project tree 
Including revert of d67b7229da

Change-Id: I5712739385b4e08b494f6915cd4fc43928653e04
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-28 11:39:11 +01:00
Orgad Shaneh
c6ca15dc15 C++: Record macro uses in #if defined(MACRO) 
Change-Id: I4d99053f540073483c16ce842426bf8cd3def421
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-02-27 21:08:34 +01:00
Eike Ziller
f5fdc07d47 Merge remote-tracking branch 'origin/3.1' 2014-02-27 17:13:27 +01:00