Commit Graph

5585 Commits

Author SHA1 Message Date
Eike Ziller
046ab0b7a3 Merge remote-tracking branch 'origin/4.10'
Change-Id: Ie1861bb221a9974d78938e9a2078c1f6aa207210
2019-06-06 07:01:06 +02:00
Marco Bubke
e904fc202c Clang: Filter macro QT_TESTCASE_BUILDDIR out
We have to universalize it later with a UI so that user can set their
own macros.

Change-Id: I5385c3c1b01dbf77a1cbc2431103fcdea3f96118
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-06-05 13:54:21 +00:00
Cristian Adam
0439eea6bc CMake build: Skip installation of test plugins / executables
Our tests run from the build folder. We do not need to install them.

Change-Id: Iaeb27e466fe0d43bc15fa3eee3bf6d2659b87083
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-05 08:28:49 +00:00
hjk
2f7ca2ce44 CPlusPlus: Avoid a few deprecation warnings
The alternatives have been around since 2012.

Change-Id: I0aa15d59efe8a547e2ad622ffda689746960d48c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-05 05:43:34 +00:00
hjk
0c3f4b0d85 Ssh: Tiny test simplification
Change-Id: I199e2b422288d29d0a3a059ddc0d145bcb27082b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-05 05:42:44 +00:00
Christian Stenger
cce76afcff Tests: Fix compile on Win - Take 2
Amends 1ecfb2d941.

Change-Id: Ibea1fe2f117234ca04caa35ec0b381814fa6d49c
Reviewed-by: hjk <hjk@qt.io>
2019-06-04 13:36:30 +00:00
Christian Kandeler
e6bda58033 CompilationDBProjectManager: Handle relative sysroot
Fixes: QTCREATORBUG-22388
Change-Id: I030b105897bd483c17aaf86229d4515b2dd747d3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-04 10:17:44 +00:00
Christian Stenger
1ecfb2d941 Tests: Fix compile on Win
Amends 4098be05b2.

Change-Id: Icc28162630470d3beab7ef9867e907cab6804688
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-03 18:52:16 +00:00
Eike Ziller
e23ebfbd20 Merge remote-tracking branch 'origin/4.9' into 4.10
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id73301c82c4ba50e0a886e850da2c92bbeed4dc3
2019-06-03 10:46:09 +02:00
Eike Ziller
23c222f61b Fix C++ Library wizard when compiled with Qt < 5.12
Only Qt 5.12 got true ECMA Script capabilities, so arrow function
expressions are not supported before that.

To be able to use "regular" inline functions, we allow usage of } by escaping with backslash.
For variables that do not start with "JS:" we already supported backslash for escaping.

Fixes: QTCREATORBUG-22336
Change-Id: I9fc638e64d2757a21fffc16355635e2fcff87a36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-03 06:46:52 +00:00
Christian Stenger
d73c271259 sdktool: Adapt tests
The names for registered Qt, cmake and toolchain must
no more be unique.
Amends e9e4c27e3a.

Change-Id: Icea00636f3632148f209616de3473816e12e4655
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-03 05:55:32 +00:00
Cristian Adam
f50859e856 CMake build: Add unittest CMake build files
On MinGW 8.1 I get the following after running ctest -j 40

99% tests passed, 35 tests failed out of 2631

Change-Id: I2c3ce7940b036e52ef393feab5837886355e7b5a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-05-29 13:46:25 +00:00
Christian Stenger
6505799c44 Squish: Remove unused functions
Change-Id: If53390d65b9013c42f7dcf5834b4caee2bcb8766
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-05-29 04:48:26 +00:00
Christian Stenger
83f37d0838 Squish: Remove unused files
Change-Id: I2c88692fa941ff4e34eb7e2a2ecf729771e7afca
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-05-29 04:48:07 +00:00
hjk
35fa8aa802 Fix projectupdater-test.cpp after FileName changes
Change-Id: I43974405522facd46a757ba4cf2886128310597c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 16:49:29 +00:00
Alessandro Portale
0933c20de8 connect() to ambiguous signals/slots: Replace static_cast with QOverload
Change-Id: I473d7a2a16509cee944a2a21b022a3f6f02cfd8d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 14:07:03 +00:00
hjk
473a741c9f Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 12:23:26 +00:00
Eike Ziller
4704f49fbb Merge remote-tracking branch 'origin/4.9'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
	src/shared/qbs

Change-Id: I369368de9b9c682b03e224d489589043e1f6782b
2019-05-28 14:01:01 +02:00
Eike Ziller
28c2a618a2 CMake build: Add missing test dependency
Change-Id: I5ba945e5ceb0fc680c5e768ec1797f2a9356f70a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-05-28 11:15:42 +00:00
Nikolai Kosjar
0bac3ad279 C++: Do not auto-insert '}' after control flow constructs
...as this rather gets in the way.

As before, pressing ENTER after { will still auto insert } on the next
line.

Fixes: QTCREATORBUG-18872
Change-Id: I8ee082962b5ee82781e51c3e5ee146343f808332
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-05-28 07:36:09 +00:00
hjk
92a52a7181 Use Qt's QFileInfoList instead of QList<QFileInfo>
Helps to adapt to potential upstream changes in Qt 6

Change-Id: Ie154bd4fd513d46cb0493758be8943fc4581d71c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-28 07:19:45 +00:00
hjk
2b1c8aa877 ProjectExplorer: Introduce a alias for QList<Tasks>
Change-Id: I91391ad22b420926b0f512cac23cfe009048b218
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 05:51:40 +00:00
Eike Ziller
e0b0a08e50 ExtensionSystem: Move away from QList
Qt 6 API will move away from it.
Use QVector for API and some std container for internal things.

Change-Id: Iff14d48a47d5ac52ade875d9c8c84ad8a4f577d8
Reviewed-by: hjk <hjk@qt.io>
2019-05-27 14:21:00 +00:00
hjk
19e1cf1520 Replace uses of qVariantFromValue with QVariant::fromValue
Deprecated in Qt 5.14, alternative has been around since Qt 4 at least.

Change-Id: I4e3a53c289088368609e0d0ce2405a832d311308
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-05-27 12:33:29 +00:00
Orgad Shaneh
1e138fbe10 Remove excess blank lines after namespace
Change-Id: I4e4f83017f2bfc2cf842c4c971ed4b05e0447e6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-27 06:50:16 +00:00
Robert Loehning
36b7071c70 Squish: Update comments
Change-Id: I10dc06b257ae82e454a47d21086b481f8bca7654
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-24 10:35:24 +00:00
Christian Kandeler
0ffbe6a9e4 CompilationDbProjectManager: Sanitize project parsing
The parsing code used to access all kinds of stuff (e.g. the project
tree and the toolchain manager) from the non-UI thread, which is not
allowed.

Fixes: QTCREATORBUG-22420
Change-Id: I4be47919d7e543376d31826dd380f66f4e060458
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-05-23 08:56:16 +00:00
Nikolai Kosjar
eb1aa8dcca UnitTest: Fix ProjectInfoGenerator.* tests
This amends e3def98c00.

Change-Id: I21deb74fe4a4387f7490c806e0990bafd06438bf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-05-21 12:54:12 +00:00
Robert Loehning
9956d8d461 Squish: Update tst_qtquick_creation
Task-number: QTCREATORBUG-20056
Change-Id: I5a7e239b9c65b32e2bc57dd594cc96bdda94b472
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-20 16:30:38 +00:00
Robert Loehning
fc8dea8830 Squish: Remove unused workaround code
We have not been using this for more than a year.
Instead, we seem to prefer having workaround code inline.

Change-Id: I37066f359eac5eda62c9c9acfcae3b89f980d024
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-20 16:15:41 +00:00
hjk
0595e67c82 More FileName::pathAppended()
Change-Id: Ie20ec34ea9712b3ec49e6233b23cef84c2019f03
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-20 14:37:13 +00:00
Thomas Hartmann
e02213262e QmlDesigner: Testproject for meta info hints
Change-Id: I610f6180fb8b26d0bc84cd291781da2f06179b7a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-05-20 12:03:35 +00:00
Cristian Adam
d855b84c5d Qt Creator CMake port
Based on Tobias Hunger's work from a few months ago.

The CMake configuration needs libclang and Qt paths specified as
CMAKE_PREFIX_PATH.

Auto tests are run with "ctest". At the moment the pass rate is 87%.

Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-17 13:33:28 +00:00
Christian Stenger
7fa1643a1d Tests: Fix missing curly brace
Change-Id: Ib24625cdeae1b2f9a1b41eecb59e52f572eb793b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-05-17 12:33:45 +00:00
Eike Ziller
0565457b5c Merge "Merge remote-tracking branch 'origin/4.9'" 2019-05-17 11:50:45 +00:00
Thomas Hartmann
3f423fc139 QmlDesigner: Fix subtle issue with transaction
In an transaction adding a property after reparenting did fail
without real reason.
If a node does not have a position (yet) we can ingore the operation.

Change-Id: I959f1cf50ac6bcacda2a29b37ae69e37158e9acd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-05-17 11:25:59 +00:00
Eike Ziller
829a08047f Merge remote-tracking branch 'origin/4.9'
Conflicts:
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I473084232ab99c18e2316154656de0035af02628
2019-05-17 12:47:24 +02:00
hjk
4dd72bd899 Compile fix
... after f99d69ee43

Change-Id: I711f8809dbdd7878b6c7fcc092f3391a2c4cebfe
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-15 09:32:29 +00:00
Alessandro Portale
5311708845 python scripts: Use "not in" operator to test membership
As per suggestion from Pyls, this changes
  if not needle in haystack:
to
  if needle not in haystack:

Change-Id: I4a482604e13e61ecee9e02935479632419710ff7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-05-10 05:53:39 +00:00
Robert Loehning
97ae2d1ac0 Squish: Fix and update tst_qtquick_creation3
Task-number: QTCREATORBUG-20056
Change-Id: I8b0980e423c2bf8921f615d04769d91c7e660dd3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-08 13:14:02 +00:00
Eike Ziller
4545c81e57 Merge remote-tracking branch 'origin/4.9'
Conflicts:
	doc/src/howto/creator-sidebar-views.qdoc
	doc/src/howto/creator-ui.qdoc
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/autotest/testresultmodel.cpp
	src/plugins/autotest/testresultmodel.h

Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
2019-05-08 12:41:25 +02:00
Christian Stenger
2330103aba Squish: Update wizard handling for Qml UI prototype
Change-Id: Idb4a8e445f0cc0c749298a4bd86020377b8baeb4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-05-08 05:18:08 +00:00
Orgad Shaneh
fc11380e07 Fix unit tests compilation + initialization order
Amends commit cc9d246b02.

Change-Id: I688df432cd03f440ec6c15ca5402d94430ce74f8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-05-03 06:21:44 +00:00
Thomas Hartmann
76206c63b0 QmlDesigner.Tests: Add regression test
Adding regression test for revisioned properties

Task-number: QTCREATORBUG-22057
Change-Id: I79d1bf1167944fc005179b064703e217a6494e33
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-05-02 12:22:39 +00:00
Ivan Donchevskii
d4c5a6f9b2 CompilationDatabase: Fix unit-test
Change-Id: I2a2e2b5ead35236f11e6f9f0ec15608b30335fd1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-04-30 12:46:41 +00:00
Marco Bubke
24cadba480 ClangRefactoring: Fix indexing
We moved inside of loop so projectPart was used many times but was empty
after the first iteration.

Change-Id: Ie2441dbdd3bb9de73ae1fd076626255599f5dfea
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-29 12:52:13 +00:00
Marco Bubke
2d520140d0 Clang: Fix system pre include search path
We now get the resource path from creator. The -fPIC case is working now
too.

Change-Id: Id191e89e6d46706748d50440038a06a349972cc9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-29 12:52:05 +00:00
Marco Bubke
1975641a3d ClangPchManager: Remove target triple
We don't need it so far and it is creating trouble.

Change-Id: Ia502452717b5be935e4ba2cd2de04007e4144199
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-29 12:51:58 +00:00
Alessandro Portale
a1c67da0a2 Tools: Use "QTC_" prefix for build-system environment variables
Change-Id: I4b75dce6a2c7bd794b8c330521292c86057e63ef
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-29 09:45:27 +00:00
Marco Bubke
facda6f502 ClangPchManager: Don't generate PCHs if there is no include
Change-Id: I88caab6ff188b64d92a74d61276c4724c33cae23
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-29 08:57:10 +00:00