feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
80,529 Commits 108 Branches 368 Tags
5e059db065b1680c4f08b901b64f102300eda6e6
Commit Graph

7307 Commits

Author SHA1 Message Date
Tim Jenssen
383026abb5 QmlDesigner: remove qDebug in tests 
Change-Id: Icbcfffede77acd0b6e2b577aab7a30e73e02717a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-06-14 18:05:19 +00:00
Thomas Hartmann
d7f24031dc Adding test for standard issues with QtQuick Controls 2 
This test is covering the standard issues we had with the
code model regarding QtQuick Controls (2).

We check if ApplicationWindow is derived from QtQuick.Window
and if Button is derived from QtQuick.Item.

Change-Id: I1a2ed894daeb06743fb950bf629a8dcf2b9a78e6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2016-06-14 15:43:12 +00:00
Tim Jenssen
1d0b45b881 QmlDesigner: fix tests in shadow builds 
Change-Id: Iaabe1516a30be520b1b0be0dd5557004312a67ec
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-06-14 15:06:21 +00:00
Thomas Hartmann
89d22b6eb0 QmlDesigner: Use QtQuick 2 in tests 
Also cleaning up some tests.

Change-Id: I531997bc6eb0b9cb8057b7e408bca1c301c88ad0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-06-14 14:42:40 +00:00
Tim Jenssen
0a67076ef4 QmlDesigner: remove unused code 
Change-Id: I4c888f69d3bedc510f0f0a9f67d96caf17c4bcee
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-06-10 14:31:45 +00:00
Tim Jenssen
4d008299f3 QmlDesigner: remove outdated tests 
Change-Id: I761d2af520f55d4a4bf405ede83af9228d7d7abb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-06-10 14:31:37 +00:00
Tim Jenssen
044743d407 QmlDesigner: reduce tests output 
Change-Id: Ia68cf7c859323c5ef82969c54f0168bf4a5ebbef
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-06-10 14:06:14 +00:00
Thomas Hartmann
568e80b591 QmlDesigner: get tests compiling and running 
105 passing, 1 failing, one test seems flaky
I skip many nodeinstance/puppet related tests,
because the tests/test framework cannot deal with the qml2puppet/emulation
layer being out of process.

Change-Id: I5b254c7e6e944b8fbd8ba490c1e8bb43d0eb38c3
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-06-10 11:57:06 +00:00
hjk
726b907cc3 Debugger: Remove debuggerstringutils.h 
With QT_RESTRICTED_CAST_FROM_ASCII making GdbMi etc operate on
QString is feasible again. Take this as opportunity to move
debugger encoding handling closer to a 'conversion on input and
output if needed, storage in QString only' scheme.

Change-Id: I2f10c9fa8a6c62c44f4e6682efe3769e9fba30f7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-09 08:09:46 +00:00
Marco Bubke
505c9be9af UnitTests: Disable small string test 
There are some compiler problems and before I change the code I want to
investigate them deeper.

Change-Id: I497aa594fe0ea67be5927cc75bf6d64158952663
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-06-08 14:16:57 +00:00
Ulf Hermann
eb948c0214 Timeline: Remove selectionIdForLocation() 
Nobody needs that.

Change-Id: I83feeb55af24393a3feebfbbd4d0f085b208bb20
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-06-08 09:44:35 +00:00
Christian Kandeler
a0f956f050 qbs build: Introduce new module "qtc". 
The qtc module gathers properties that used to live in the top-level
project file. This is the first step towards making it possible to build
plugins against an installed Qt Creator ("out of source build").

Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2016-06-08 08:46:00 +00:00
hjk
b198d482cf Debugger: Robustify Qt version extraction 
Task-number: QTCREATORBUG-15497
Change-Id: I61b52d23e0acf69e2030f8dca2691fbaa6b309ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-07 05:33:13 +00:00
Eike Ziller
33210099f1 Merge remote-tracking branch 'origin/4.0' 
Change-Id: I9793f0f9019b16f3725c5a9708a5ccf81557cdc6
 2016-06-03 09:50:43 +02:00
Robert Loehning
79623d5774 Squish: Base getPaths() on new path functions 
Change-Id: I54cd03bc1d24b715df15de37291f776f9867416f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-02 09:35:16 +00:00
Christian Stenger
b04b5e5d75 Squish: Provide functions for getting paths inside Qt installation 
Change-Id: I273304f0c6d451d28a256c99588479525eef95e4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-06-01 14:50:25 +00:00
David Schulz
6c18ed50d2 Tests: Fix linking reactivated manual plugins on win. 
Change-Id: Ibd4db0c6a065dd264f693d663b4a940d2f3a7e58
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-06-01 11:05:03 +00:00
Orgad Shaneh
8de20c9d6c ExtensionSystem: Revive manual test 
Change-Id: I24c627e964afa33883bde571960ed390b07be985
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-06-01 05:34:28 +00:00
Robert Loehning
4117ba7313 Squish: Replace remaining shell usages 
Change-Id: Id7c2c1a17fed053f2e8601fc4c7716705e260431
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-31 14:52:17 +00:00
hjk
e108d6fe48 Debugger: Fix transport of negative signed chars 
Change-Id: I9b25d4b8e4b68d9cef674581d1a42eb75e21ec56
Task-number: QTCREATORBUG-16353
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-05-31 12:12:33 +00:00
Eike Ziller
73bb92c5a6 Merge remote-tracking branch 'origin/4.0' 
Change-Id: I89c52ca2145a43c94d3366367ba72fde605dd577
 2016-05-31 12:02:13 +02:00
Robert Loehning
7d51d3849a Squish: Silence more warnings 
Change-Id: I6259382a2359a795654a6d6536112c090ede130f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-31 09:15:35 +00:00
Christian Stenger
0e331a2e29 Squish: Adapt to changes in Quick Application template 
The template has slightly changed in 6b506b34ec.

Change-Id: Id58e67beacaac046c6dd235b715f360dc7ef4c09
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-30 12:35:39 +00:00
Tim Jenssen
f59759f9da msvc 2013 build fix 
Change-Id: Ice81612dd358a51c6847a1c7dfbf5115ad43cbab
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-05-30 11:06:51 +00:00
Robert Loehning
7e9aa9c908 Squish: Silence warnings in tst_default_settings 
Change-Id: I668cc7b1fcb569b50d2178fe792f566721c9d4d4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 10:40:12 +00:00
Robert Loehning
c1e7cf84e4 Squish: Do not use shell in getOutputFromCmdline 
Change-Id: I731b119169063912cd3b528a1a6a58727002ae67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 09:13:04 +00:00
hjk
7a80f2f01e TreeModel: Take responsibility for some of the casting 
This adds a templated layer on top of TreeModel that can specify
item types for the top three layers in the model, relieving user
code from some of the previously necessary type casting.

Two common setups get an extra layer with convenience functions
on top: TwoLevelTreeModel for two-level model with a first level
of static headers and a uniform second level, and UniformTreeModel
where all non-root nodes are the same.

"Untyped" plain TreeModels are still possible.

The walkTree() feature and untyped iteration in the base
TreeItem and TreeModel is retained for now to ease transition
in downstream modules, but is planned to be removed soon.

Change-Id: I67d75a1a4e18e8f254dbfb458db03510d8990d8b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-05-30 06:25:48 +00:00
Eike Ziller
0c5bae640b Merge remote-tracking branch 'origin/4.0' 
Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
 2016-05-27 12:01:36 +02:00
Christian Stenger
e564abdd9a Squish: Use more stable subprocess code 
Change-Id: I9a895831f9d57562a9eeb8491cc7f46c1da2eba1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-27 04:35:49 +00:00
Christian Stenger
a00a73a74d Squish: Fix expected failure in tst_SCOM04 
Change-Id: If09e33b616356e0f0eb5aa37c035acaf2c2adaac
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:54:44 +00:00
Christian Stenger
2b57a1afa6 Squish: Fix handling of context menu on OSX 
Change-Id: I6f5d50eca0199826e8af0f11016a1dfeb924f046
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:31:25 +00:00
Christian Stenger
1f1a9e5870 Squish: Fix expected sort order 
Change-Id: I882ad3633f7cf827aea086b5f5fd2a9204eeb482
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:07:47 +00:00
Christian Stenger
3b820cc9a4 Squish: Fix tst_installed_languages on OSX 
Change-Id: I470047d663ec4c2bfebaa17baf67bc811d9c0c65
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:06:15 +00:00
Robert Loehning
b2f869c411 Squish: Test code model's reaction to decimal separator in float 
Must not be interpreted as member access operator.

Task-number: QTCREATORBUG-16188
Change-Id: Iec252fbc63899cef5b004a5770e3ebee5af7188e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-26 11:48:03 +00:00
Christian Stenger
91d7886313 Squish: Fix tst_designer_edit on OSX 
Change-Id: Idabdd1577373636d9b39c83447febdf4da7b04f1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 11:31:15 +00:00
Christian Stenger
b1e9290b73 Squish: Raise some timeouts a bit... 
...as these frequently fail on OSX.

Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 05:08:23 +00:00
Robert Loehning
80ef8d11f9 Squish: Handle failing startApplication() without ClangCodeModel 
Change-Id: Ic50939219c8dcf2b04423d99d0d5021de8f26afc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-25 15:34:38 +00:00
Robert Loehning
0e299cbd0b Squish: Expect failures in tst_memberoperator on Windows 
Change-Id: I582109d104816545c804340c7e0d4dbe343d55f3
Task-number: QTCREATORBUG-16336
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-25 15:30:57 +00:00
Christian Stenger
0aff733a91 Squish: Stabilize clickOnTab() on OSX 
Change-Id: I984a6a2012668e0b0095b2118b9d7001c7cda616
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-25 04:41:31 +00:00
hjk
fbc82d3f88 Debugger: Fix dumping of numeric QJsonValue inside arrays 
Task-number: QTCREATORBUG-16313
Change-Id: I544e89fc964cd404652d8ea0c8df127e51235292
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-24 13:09:19 +00:00
Robert Loehning
6a74d8cad1 Squish: Fix suite_SCOM for Qt 5.5 
Change-Id: Iea47ca2c74a6ac2287aee26418636abcb748a5d2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-24 11:36:17 +00:00
Christian Stenger
c9dac0fa61 Squish: Raise waiting time when using FileDialog on OSX 
Necessary especially when trying to open big files for which the
system file dialog of OSX is creating a preview.

Change-Id: I6d352b78f76571fbb7224902b05e228d584c443a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-24 09:59:13 +00:00
Ulf Hermann
6b4963b549 Ssh: Implement tcp/ip forward tunneling 
Change-Id: I529b3392ea7e4cbae2c736c9f55352ef6b19da98
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-05-23 07:44:06 +00:00
Victor Heng
11ef0db2fd QmlJS: Keep pragma directive when reformatting QML files 
Change-Id: I1f11e95565a90e4fc7b908c03d49f6abbd37b8be
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2016-05-19 09:55:11 +00:00
Eike Ziller
ec231b5910 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	src/plugins/valgrind/valgrindruncontrolfactory.cpp

Change-Id: I96c0f8cc3b49f8f55f45ef1f839857f878f532f4
 2016-05-18 12:12:46 +02:00
Robert Loehning
8c8ed3294f Squish: Raise timeout for help content 
Change-Id: Idc53e974a271d0c833ca8371c9a65b0c6d98c45c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-18 08:43:45 +00:00
David Schulz
8da31c87ee Add version number to lib dependencies on windows. 
Change-Id: Ied3707f18cf2753679eeaa2bcff0edfba3c7517e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2016-05-18 05:02:40 +00:00
Robert Loehning
990e2a83ca Squish: Fix tst_HELP02 
We don't just need any items in the model,
we need an item that passes the filter.

Change-Id: I831a8a2d4ba27c838e7ea07625d066a19946a789
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-17 13:11:31 +00:00
Orgad Shaneh
aca8f9a731 UnitTest: Fix compilation 
Change-Id: I4aa18c552bdfb8bb685e224b63c6080f25afa567
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-05-17 10:17:43 +00:00
Eike Ziller
6efd8e33e2 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I6217662f0c51d04a83f7a85dc5d7c7f25e78e09a
 2016-05-13 16:24:37 +02:00