feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

4400 Commits

Author SHA1 Message Date
Robert Loehning
e9ab82c5b0 Squish: Stabilize tst_select_all 
Same issue as fixed by 6827072fac

Change-Id: Icb47db58dd647b4263452c5d36ab241fc40eccb0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-06 11:28:45 +02:00
Robert Loehning
f6f80d88a2 Squish: Update recommended version 
Change-Id: I4077a2f4de7aeaa5dbcf4991e01d5449130ca438
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-05 15:20:45 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
 2014-05-02 10:00:20 +02:00
Christian Stenger
4b2cc015f8 Squish: Make sure correct output panes are used 
We expect the first five toggle buttons for output panes to be visible
by default. Additionally added buttons will have the property 'occurrences'
with a value depending on their position - not their label. Using the menubar
for these additional output panes is safer.

Change-Id: Ie58f8dd56ec35bfa9f6bba871aa807e4b1507c75
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-30 15:45:02 +02:00
Robert Loehning
ca9a316cfd Squish: Test automatic saving of files before build 
Task-number: QTCREATORBUG-12014
Change-Id: I20080ac89d63c1d0a00cb18b31f5539bf2b4a554
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-30 15:29:20 +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
Robert Loehning
76086123c8 Squish: Stabilize tst_git_clone 
Change-Id: I144d2a528e1a8cb4a75d16814a022dac8c36dfce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-30 09:29:42 +02:00
Christian Stenger
a966e33308 Squish: Remove unnecessary imports 
Change-Id: Ia902e0a797fea947f83505f6b09e3efed24f65b1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-30 08:09:12 +02:00
Christian Stenger
7b6da4b7f2 Squish: Fix verifyEnabled() 
If verifyEnabled() was used with an object's real name it failed due
to using invalid syntax.

Change-Id: Ie88ffbda3ab1601fbd781955146b6600ba5104a3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-29 15:27:47 +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
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