Commit Graph

6116 Commits

Author SHA1 Message Date
Eike Ziller
bf490b62e0 Merge remote-tracking branch 'origin/4.12'
Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
2020-05-06 09:43:20 +02:00
Robert Loehning
20dc69c45d Squish: Try stabilizing CLI output
Change-Id: I0ff6aaaa62b9596487a279cdf5e597a3b7c83679
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-05 15:12:26 +00:00
Eike Ziller
be73f41ad4 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
2020-05-04 10:52:34 +02:00
Christian Kandeler
f553e3d16a qbs build: Fix sdktool autotest on Windows
Make sure to fix the path separators for the macro that gets passed on
the command line.

Change-Id: I444883e6fc5a2b49d73a1fa52aa1ea26b207185c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-04 08:39:15 +00:00
Tim Jenssen
53d161c98e Merge remote-tracking branch 'origin/qds-1.59'
Change-Id: I8a5d7d98b4d75379fe3953fe00bdb939d1722676
2020-04-28 16:18:24 +02:00
Marco Bubke
0e1870368c Sqlite: Add Sqlite::Value
It adds a layer if you don't know if the type is integer, float or string.
It does not handle bytearrays here because so far there is no need. There
are two classes, Sqlite::Value and Sqlite::ValueView. Value owns the
string, ValueView holds only a view the string. So there is no allocation.
It is designed to hold Utf-8 string like Sqlite but it can be easily
converted in and from QString or QVariant but mind about that this is not
free. ValueView has no constructors on perpose because it would be
ambiguous if there would be constructors for the other primitives of
the Sqlite layer like "int64", "double" and "string view".

Change-Id: Ia39364eb2fc1998e5c59fdb4316add22c748507d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-27 18:17:11 +00:00
Eike Ziller
d79febdde9 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
2020-04-24 13:58:05 +02:00
Robert Loehning
43454c3fcd Squish: Update expected tree for qbs
Change-Id: I3ba303f0206db193d3e00ce52ac20f516823881c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 09:14:08 +00:00
Eike Ziller
8984272769 Merge remote-tracking branch 'origin/4.12'
Change-Id: I296a61fe43aea134de9e7a6ee8042af3f45f5e99
2020-04-23 11:09:15 +02:00
hjk
252a0431d1 Debugger: Fix dumper for std::unique_ptr with custom deleter
Task-number: QTCREATORBUG-23885
Change-Id: Ifba6ef7233886d1c9341e7912d6924cd9afbc4eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 06:08:12 +00:00
hjk
0603eb925f Debugger: Work around deprecated QProcess::start(command)
Change-Id: I30d9656fb9a73399fb79b7a6e956ee0e6f0ab6a1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-22 07:52:43 +00:00
Robert Loehning
fd17810e82 Squish: Don't use negative y-position for QMouseEvent
Change-Id: Ib453b41e5906ddf24228b92f8c904b39eea4526f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-21 10:04:35 +00:00
Robert Loehning
7c95e17436 Make WidgetTips Squish-testable
Change-Id: I337fdca3541c5b2fb8f09ab2d7721b8950c0bea9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-21 10:01:01 +00:00
Eike Ziller
4fcfb7aea6 Merge remote-tracking branch 'origin/4.12'
Change-Id: I97e4fe727ca9560f2a1f4b93abcfb9fda091364e
2020-04-21 09:26:50 +02:00
Christian Stenger
f9ff63e340 Squish: Avoid false positive in tst_CSUP01
If intrinsic headers are globally present the proposal
widget might also suggest _mm_undefined_si128 or
_mm256_undefined_si256 when typing 'unsi'.
Be slightly more specific and therefore exclude these.

Change-Id: Ie988ce7a1312fb31803a6e9fa885e10a51229d09
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-04-20 18:47:52 +00:00
Eike Ziller
602d690bab Merge remote-tracking branch 'origin/4.12'
Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
2020-04-17 08:09:55 +02:00
Robert Loehning
3837cdac2b Squish: Ignore two fails in tst_rename_file
Neither can I reproduce them without Squish, nor are
they clearly inside the scope which needs testing.

Change-Id: I25494de34cd216678913fbf04dca88c3c0126ed9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-16 10:04:59 +00:00
Robert Loehning
38d4ccbdcb Squish: Fix and update tst_rename_file
Change-Id: Idc8134dd0df5df530285525783532c21014087a8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-15 17:15:15 +00:00
Robert Loehning
ec79f42701 Debugger: Update references to Locals and Expressions
These are two separate views now

Change-Id: I010ad0b937982704310d102d1f4338ec0c29a370
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-04-09 09:01:16 +00:00
Eike Ziller
897abf24e2 Merge remote-tracking branch 'origin/4.12'
Change-Id: I79083060dfc3bc4408123acd3b7305b9701650fd
2020-04-03 08:12:52 +02:00
Robert Loehning
da558f3376 Squish: Don't close files before exiting Creator
It's not needed and it's fragile since
the menu item is disabled at times.

Change-Id: I0c72c5072374462d99740e7eaa752f91e019c6ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-02 09:46:19 +00:00
Robert Loehning
dd4beac2a3 Squish: Don't use underscore in project name
We'd have to escape it so openDocument()
can find it in NavigationTreeView.

Change-Id: I0be07874fdb6b8fba7a3a2e01e2927a79a47e358
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-02 09:45:50 +00:00
Eike Ziller
ee2840d5b8 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ic741fdedc168430e5be6cb1645d9329dbc7a6b08
2020-03-23 09:35:54 +01:00
Robert Loehning
7a1974cb34 Squish: Remove dead code and simplify
Task-number: QTCREATORBUG-16607
Change-Id: I2bd8857317adf046e4563a150a74186f4c2d233e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-20 12:18:57 +00:00
Lars Knoll
99a81e78d5 Port from QRegExpValidator to QRegularExpressionValidator
QRegExpValidator is going away in Qt6, so port over to the
version using QRegularExpression.

Change-Id: Iecd1ba1f0e5e01009ae43b79c1ccc73f0fc046b2
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 11:39:42 +00:00
Christian Stenger
a51a4f7915 Squish: Fix expected object properties
Change-Id: I7f2e3ef4559fac83d17a06a231036be45f9e63bb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-19 13:11:15 +00:00
Christian Stenger
38458c3e40 Squish: Fix tst_qml_locals
The content of the locals and expressions had
changed as it nowadays provides information
on the qml engine as well.
Adapt the test accordingly.

Change-Id: Ib5fa96e3150206a374ac5e115e789cc3b983497b
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-13 12:35:45 +00:00
Robert Loehning
810538c281 Squish: Adjust expectations in suite_CSUP
Task-number: QTCREATORBUG-22728
Task-number: QTCREATORBUG-22729
Task-number: QTCREATORBUG-23159
Change-Id: Iad21fa8e82f314bc7bde42dc184cf72553eab3a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-12 12:04:20 +00:00
Christian Stenger
38cf9047c9 Squish: Adapt to changed tool tip text
Change-Id: I7c86bcce5ee5c58147810243d6b7e7c59df94f21
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-12 11:51:35 +00:00
Robert Loehning
aac77eecb9 Squish: Replace Qt version 5.6.1 with 5.14.1
Task-number: QTCREATORBUG-22111
Change-Id: Iaae052e73a264252e399bd0992be4b420e2799ae
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-10 15:59:08 +00:00
David Schulz
42f34c8a55 Dumper: Do not test fortran string on windows
Which doesn't exist on windows and will fail the test

Change-Id: I0dd005ccfcbf54faa716c642c5441c2086b3a32a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-09 07:10:57 +00:00
Christian Stenger
33b091bd40 QmlJS: Fix compile
..in general, with tests, and when using a namespaced Qt.
Amends b09a48599e.

Change-Id: I99e275e10df5eed741d021911a360457f0d0d2e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-04 08:22:12 +00:00
Orgad Shaneh
e4dab6b83e QmlJS: Fix compiler warning and add a missing include
qmljsdiagnosticmessage_p.h: In static member function ‘static QmlJS::Severity::Enum QmlJS::DiagnosticMessage::qtMsgTypeToKind(QtMsgType)’:
qmljsdiagnosticmessage_p.h:72:5: warning: control reaches end of non-void function [-Wreturn-type]
   72 |     }
      |     ^

Change-Id: I2183199bf257453e0af2998b739fae8c90f5c098
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-03-03 17:28:52 +00:00
Fawzi Mohamed
a670e203b1 Ensure that null dereference in test is not optimized away
Change-Id: Icf8eb894a8277353448f46b18d5d6614be1d2350
Reviewed-by: hjk <hjk@qt.io>
2020-02-27 16:08:09 +00:00
Robert Loehning
29ab2d3644 Squish: Break endless loop in tst_CSUP06
Change-Id: Id0762128a9c2b6b3cc15684ff1b35c38b3a64c97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-26 11:07:56 +00:00
Christian Stenger
5d3e56b3b4 QmlDesigner: Fix compile with Qt5.11 and building tests
Change-Id: I96dea7de0d185c67ea3a26a42de0805bd60dc1d1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-24 13:40:07 +00:00
Robert Loehning
7eda08f600 Squish: Directly click mode selector
The tooltip doesn't show up on Windows anymore unless
you manually move the mouse.

The positioning has proven to be stable, so we don't
need to double-check using the tooltip anymore.

Change-Id: I92400d1fa273d4fb6a011cdf00c3b127c06764d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-24 10:50:34 +00:00
Robert Loehning
fd2653bdc2 Squish: Remove outdated error handling
Change-Id: If3bb6f8dd5c79e11139801623f63ce88ea46cf42
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-19 11:58:57 +00:00
Robert Loehning
0b6386d1f8 Squish: Update QtOptionsPageWidget
Fixes error in tst_default_settings

Change-Id: I927edb0cab7c73a4830272cf6fb2f655cee4cd8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:43:52 +00:00
Robert Loehning
3e9437d8c5 Squish: Update chooseTargets()
Fixes tst_cmake_speedcrunch

Change-Id: I154647ca2108676b4184170ef121649547c3fd41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:42:34 +00:00
Robert Loehning
46e5d52238 Squish: Update addAndActivateKit
Fixes warning in tst_opencreator_qbs

Change-Id: I82ba025ebc6befd222dd8f47cabcff08ad2e584e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:41:41 +00:00
Christian Stenger
4205134847 Squish: Fix compiler toolchains on macOS
Change-Id: I95aa7f0c91bc538ec7ada3ea04a8285b5cbe5f9c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-17 14:06:31 +00:00
Robert Loehning
1ebb72b47f Squish: Update expected tooltips
Change-Id: I88c5757b1f3beda34773ec3738779094a8441c2f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-17 10:53:50 +00:00
hjk
d3d294cd81 ExtensionSystem: Some modernization
Mostly 'foreach'.

Change-Id: I5390d03bb5cc37c3674b61cea6f5d22bae554ed2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-14 09:50:07 +00:00
David Schulz
e3c7b72003 LanguageClient: introduce new type for gorgeous formatted errors
Change-Id: Ia76bd768bcb6d33ce66319dddf8cc355a41ffa31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-12 11:25:01 +00:00
Robert Loehning
debc304bf8 Squish: Update detection of configured kits
Change-Id: Icade1feffde4a1b252175d8012c411a0a423748f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 12:04:26 +00:00
Robert Loehning
11abdb9ddc Squish: Fix error handling
Change-Id: I896ce824a0c75d47f7b123f80937e81793cc33e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-07 11:08:42 +00:00
hjk
a44bfdd779 Provide an empty default IPlugin::extensionsInitialized()
And remove all empy re-implementations.

Change-Id: I19f0b4e55c042c96693ecb89766f97f0a97b54ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 10:21:34 +00:00
The Qt Project
183048b587 Merge "Merge remote-tracking branch 'origin/4.11'" 2020-02-05 11:00:37 +00:00
Eike Ziller
5c121d5791 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca
2020-02-05 11:59:35 +01:00