Commit Graph

52302 Commits

Author SHA1 Message Date
hjk
5baecec6b7 Qnx: Fix C++ debugging
Task-number: QTCREATORBUG-17901
Change-Id: Iab7dfa3eb9a211770e45405f344d75ff20e8acae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-09-29 14:26:36 +00:00
Eike Ziller
af8cd2b633 More changelog
Change-Id: Ic0064a21bf080ddc4803bcbbe92d0dab29d765d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-29 09:40:25 +00:00
hjk
64d784ec9a Qnx: Fix Qml profiler startup
This essentially replicates the RemoteLinux setup with
the additional Slog2Info runner.

Verified to work with Qt 5.9.2 on a BD-SL i.MX6Q_Sabre-Lite_Board
armle running QNX  6.6.0 2014/02/22-19:07:53EST

Task-number: QTCREATORBUG-18954
Change-Id: Iffea289b7c7f25d23472c9e12b5e45c460c93795
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-09-29 09:23:32 +00:00
Eike Ziller
2364efc133 Add changes file for 4.4.1
Change-Id: Icca756e45af941b0d6fe320ebc06183e27c01f02
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-29 07:29:27 +00:00
Vikas Pachdha
66a42a7ffb Android: Fix the SDK platforms parsing for SDK tools 26.1.1
Task-number: QTCREATORBUG-18962
Change-Id: I780193be482ebc151931196792068d7c4d1ad808
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-09-28 12:34:59 +00:00
Nikolai Kosjar
315031e3f5 GLSL: Avoid infinite loop at error recovery
For error recovery additional tokens are tried to produce a valid
grammar rule.

For the specific case in the bug report

    for(int x=0; x y

the two consecutive identifiers in the end triggered an infinite loop
since the identifier token is also part of those additional tokens that
are tried.

Circumvent this by trying a more conservative list of tokens on the
second try.

Done-by: Erik Verbruggen
Change-Id: I271dddecf947a06ed3af5f9955ee630441533342
Task-number: QTCREATORBUG-18967
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-28 10:40:32 +00:00
Nikolai Kosjar
c354eff5e9 GLSL: Fix conversion warnings on Windows
This was actually already fixed with

  Fix compiler warnings on windows.
  commit cc04b84917.

However, glslparser.{h,cpp} were changed, which are generated from
glsl.g. Fix the warnings in the source file glsl.g so the next time the
parser is re-generated the changes are not lost.

Change-Id: If7e5f45ff1a93d1d7b6c9213697884f5a7e9ec5f
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2017-09-28 10:40:26 +00:00
Nikolai Kosjar
aca8e8643c GLSL: Re-generate parser
...by running ./make-parser.sh to make a subsequent change less noisy.

qlalr in PATH is from Qt 5.9.1.

Change-Id: Ia39181b55cd0e16207fa809f0db92cdeba3b095c
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2017-09-28 10:40:19 +00:00
Christian Kandeler
75395af824 QbsProjectManager: Respect overridden target ABI
Auto-detecting the architecture in qbs is all well and good, but if the
user explicitly set an ABI in the toolchain widget, we must set
qbs.architecture accordingly.

Change-Id: I3a2c441ceea5e939e43764e0468588d2d0ef323c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-09-27 16:13:06 +00:00
Orgad Shaneh
c94b813561 Dumpers: Quit test immediately if make fails
Change-Id: Idee48a997dce047e5ad90d133fce9c610f609a9a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-09-27 08:35:49 +00:00
Orgad Shaneh
119fc885be Dumpers: Fix tests execution on Windows/MinGW
Change-Id: Ie6207f5edba865e880249d6f70daf1e9c72c4163
Reviewed-by: hjk <hjk@qt.io>
2017-09-27 08:27:10 +00:00
Orgad Shaneh
6f1a18cc37 Dumpers: Modernize tests
* Remove QLatin1*
* foreach -> for

Change-Id: Ifac9b14b9904df8d112c71f791f1e0bd45ffc584
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-27 06:20:01 +00:00
Christian Kandeler
f45369b8f5 Fix qbs build for qbs >= 1.10
Shadowing modules does no longer work from qbs 1.10 on; we need to give
our implementation of qbsbuildconfig a higher priority.

Change-Id: I703b780d564c43ebc2a4318f683537f10c4e5f3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-09-26 14:02:44 +00:00
Eike Ziller
653e1e18c1 Dev package: Include .hpp files
Like optional.hpp

Change-Id: I1cc804834f34982dedfae0597179e523ff3bf522
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-26 08:15:04 +00:00
Orgad Shaneh
ec4269f6a1 BareMetal: Fix target file name resolving
Broke by 1acd9d30dc.

Change-Id: I0dbf14aeb345743eb22a033ac3570c6af4eb0bb2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-26 03:38:23 +00:00
Filipe Azevedo
846d89811a Fix unstoppable debugger
For some reason sometimes a user stop request with lldb can trigger
a spontaneous stop, avoiding the debugger to stop correctly.
This change fix the issue by emitting the correct states from
lldbbridge.py.

Change-Id: Ib8a2f4875824f4fff426b2d5e0fc4a79ce48c68e
Reviewed-by: hjk <hjk@qt.io>
2017-09-20 09:49:53 +00:00
Nikolai Kosjar
76006a1353 C++: Fix crash with invalid raw string literal
While parsing a document Bind::asStringLiteral() Token::spell() was
called for a raw string literal token with a Token::literal nullptr.

This is due scanRawStringLiteral() not properly aborting for
invalid/incomplete code and that the code paths handling
multi-line-raw-strings were not limited to the highlighting case.

Address both cases.

Task-number: QTCREATORBUG-18941
Change-Id: I489d288ccbd7b59be396dada846613ff555436cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-20 07:38:04 +00:00
Serhii Moroz
0bf27af0a7 TextEditor: Fix blockSelection painting in "Text Wrapping" mode
Change-Id: I1ba4587ce4f8e88a1c81c5ac3c9d6dac582bd71f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-19 13:48:06 +00:00
Orgad Shaneh
a627f4eef7 Dumpers: Print readable output in tests
Change-Id: I32864c9c1b8fe60b5b01423f68e63a3c00b936f8
Reviewed-by: hjk <hjk@qt.io>
2017-09-19 13:47:19 +00:00
Andre Hartmann
80415bd14e Revert "SearchResultWidget: Disable replace button if replace text is unchanged"
The Refactor -> Convert to Camel Case quickfix calls setReplacementText()
with the replacement text already, in contrast to the other search and
refactoring functions, which pass the search text. Therefore, the replace
button is disabled wrongly in that case.

This reverts commit e75f595873.

Task-number: QTCREATORBUG-18947
Change-Id: I906a58f65a88cce42d2da6431e59b88fae4ec45a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-19 10:52:44 +00:00
Robert Loehning
b58dadfecc Squish: Enclose code model tests in sections
Change-Id: I4478acfc5ea7b3fa22d1cd17576e04fdda81dbb9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-19 09:44:08 +00:00
Orgad Shaneh
2760b9fc67 Dumper: Dump CHAR/WCHAR arrays as strings
Change-Id: I78bdb181e27cc858356c9026fc960135b54cdcbb
Reviewed-by: hjk <hjk@qt.io>
2017-09-18 11:43:51 +00:00
hjk
0b8ab0d78a Debugger: Don't second guess on run in terminal setting
Task-number: QTCREATORBUG-18912
Change-Id: Id6ded1b7df03273048e118e5679f288b21066667
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-09-15 12:13:04 +00:00
Orgad Shaneh
f10af21922 CMake: Fix auto-detection on Windows
Recent CMake installer (3.9) installs the executable in CMake/bin.

Change-Id: I3912badc0907c91044e76b3155e924dd985819f1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-14 10:01:15 +00:00
Nikolai Kosjar
ad560bf019 CPlusPlus: Avoid nullptr access
Task-number: QTCREATORBUG-18903
Change-Id: I852b5de453d44c16adffd44c89900cfb8c3cc522
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-13 12:09:46 +00:00
Thomas Hartmann
f439183c8d QmlDesigner: Change selection in the release event
We already change the selection currently in the press event,
which leads wo weird behaivour if e.g. shift is pressed.
In this case the item is immediately unselected which is unexpected
and cannot be moved anymore.
Generally reacting to the event in the release event is the correct way
to do it.

Change-Id: Ib765f97f85e5dbeb6148d48f8640f1798a057b48
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-13 10:36:20 +00:00
Thomas Hartmann
91cda49d7c QmlDesigner: Fix shift modifer in layout case
The move tool normally does not reparent, but by pressing shift the user
can enforce reparenting. In the drag tool we prefer to reparent to layouts.
The shoft modifer disables this heuristic.


Task-number: QTCREATORBUG-18737
Change-Id: Ic8041aed537619b16b892a791c0d2bc2390af204
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-13 10:36:05 +00:00
hjk
360609eb7a Debugger: Add to solib-search-path, don't replace it
Task-number: QTCREATORBUG-18812
Change-Id: I0fb8d81d55e9928bd3825c510a11ab426ec082c6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-13 10:09:28 +00:00
Orgad Shaneh
2cc0f27589 Replace -x with -- for gnome-terminal
-x is deprecated.

Change-Id: Ic00b8042caff1620abe3e51f9d3b3198d606f084
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-09-12 14:52:39 +00:00
Robert Loehning
9690337f47 Squish: Update expected tree for tst_cmake_speedcrunch
Needed since 3bb3f4af56
filters out duplicates.

Change-Id: If7e56914feb9d22c1620822fbb363b55b894a41a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-12 12:20:10 +00:00
Tobias Hunger
ff7752eebf ProjectTree: Handle containerNode in ProjectTree::hasNode
This fixes e.g. "Add Existing Files..." triggered on the top-level
node of a project.

Task-number: QTCREATORBUG-18896
Change-Id: I763e9a31edbcfd8ac9a4f8b8b30ef885789ad1a5
Reviewed-by: hjk <hjk@qt.io>
2017-09-12 11:50:29 +00:00
Christian Stenger
6d0c167ba7 Squish: Update language test
Danish and Ukrainian had been added a while ago, so add them to the
list of languages to check.

Change-Id: I92c507e3a567efa39d7295559af0fb16bbcd1bb6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-09-12 09:53:30 +00:00
Eike Ziller
8e3efd92c6 Fix Get Started Now (and other links)
If we do not specify the correct documentation URL including the version
number, QtHelp will look for any documentation that has the given path.
Since we now register Qbs documentation, and that also has a file
"doc/index.html", the Get Started Now button could open the Qbs manual
instead of the Qt Creator one.
Specify the full documentation URL including version number to ensure
that QtHelp opens the right page.

Change-Id: Ia77103fe2763dd208d3b9a279a8301f7f5799c8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-12 07:32:34 +00:00
Nikolai Kosjar
f2e5e22009 Clang: Avoid waiting plugin side if (re)parse fails
If a parse or reparse operation fails, the corresponding translation
unit is "not intact" anymore and further job requests for that
translation unit will be silently discarded without notifying the
plugin. This is especially problematic when the plugin expects/waits
(for) a certain message.

A parse/reparse can fail due to e.g. an invalid commandline or an
internal crash.

In such a case, ensure to send some dummy results.

Task-number: QTCREATORBUG-18864
Change-Id: Ida9b8066fd55e64027a9b0d8bd5cf365b16a7356
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-12 06:46:29 +00:00
Claus Steuer
d85e9bbe2f AutoTest: Fix test result output when debugging tests
When executing tests in debug mode the results are not displayed
as usual in the test result pane. In debug mode a newline character
is added to each line before passing it to the outputreader. The regular
expressions used in the GTest- and QtTestOutputReader do not match
because of the newline character.

Change-Id: Ia8051497097c950b5cf2d64cd4de0cb425802c50
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-12 05:37:12 +00:00
scootergrisen
43c0d896a2 Update danish (da) translation for Qt Creator 4.4
Change-Id: I83d612efb8cddfb98961901efbf8bc6832b43682
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-09-11 18:45:38 +00:00
Nikolai Kosjar
4de68511e6 Clang: Output warnings if QIODevice::write() fails
Change-Id: I9588a5081d8adb7b2db7955c4f48a2391e202396
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-11 10:29:56 +00:00
Orgad Shaneh
3b4c6ed5bd PushToGerrit: Fix support for multiple projects on the same remote
Use case: A project has a legacy repo and a new repo. Both are used as
remotes in the same local directory. If the legacy repo's remote name is
less than the current repo (legacy < origin) then only legacy appears.

Change-Id: Ie02cbee3142c4d2628cb51cbcad50cf903a75bb0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-11 09:49:41 +00:00
hjk
8037d5e02f FakeVim: Properly recognize tabp...tabprevious
Note that this does not fully solve the linked issue as the
triggered GOTOPREVINHISTORY action does not have the same
behavior as :tabprevious

Task-number: QTCREATORBUG-18843
Change-Id: I26a719f77d2c1727bb18da46e13f5a0be48473bc
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-11 09:03:54 +00:00
Andre Hartmann
201a09b5c5 C++: Fix highlighting of "float" keyword for C files
... in the Classic Code Model.

Broken by 0d1fef41f7

Task-number: QTCREATORBUG-18879
Change-Id: I7d0222cc81e8847827af042e89d3b75c57f5d454
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-11 08:59:05 +00:00
Robert Loehning
40e90cb8be Squish: Update expected combo box in tst_WELP01
Change-Id: I35f40a637a6914bea2057b951409b21b7ce90c8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-08 11:47:26 +00:00
Tobias Hunger
3bb3f4af56 CMake: Filter out CMake input files that are already listed
Filter out CMake input files that are already listed elsewhere in the
project tree. This is server-mode only.

Change-Id: Ib62cd5b521a51180d12d76ec2868a99dbdecc272
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-08 11:18:58 +00:00
Leena Miettinen
315cede70f Doc: Add links to Qt Creator Application Manager Plugin Manual
Change-Id: I1333652a41ff831ae5a7b84dc56041afc074cd60
Reviewed-by: hjk <hjk@qt.io>
2017-09-08 06:52:35 +00:00
Christian Stenger
85e656b041 Squish: Workaround Squish issues when using nativeType
When using nativeType() Squish sends single key press events for
any char to type.
nativeType() does not wait until these events have been processed
which leads to complete useless time measurings inside
tst_tasks_handling as timestamps are taken too early if nativeType
had to be used - which happens when a native FileDialog is used.

Change-Id: I446de898fd99b2e169ca39bef1adb4306d6ee530
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-09-07 12:47:44 +00:00
Ivan Donchevskii
5b48bd0420 Clang: fix clang static analyzer on Windows
1) mingw kit + qmake: do not add target includes
not to override clang paths (for intrinsics and more)
2) msvc kit + qbs: remove target option from
clang-cl arguments

Change-Id: Ifb494ee61ae2d39e957cff31dbd647c66910be17
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-07 10:08:30 +00:00
Nikolai Kosjar
88e7af8a21 UnitTests: Disable related tests if suspend-patch is missing
Change-Id: Ifdccf2e5842aff13528e52caa4dfd3288214d723
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-09-07 08:59:40 +00:00
hjk
015f0c03cf Qnx: Fix debugging
This apparently fell through the cracks in 89f02cba2.

Task-number: QTCREATORBUG-18804
Change-Id: Ib00a5a074ec1df3292267a194e8e87a92d3c6dfc
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-07 07:01:52 +00:00
Eike Ziller
5680c1c874 Register Qbs documentation (if available)
Task-number: QTCREATORBUG-18441
Change-Id: I800fae056f7d1cfc60fab3b0c1964d3b9a2a99f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-07 06:46:36 +00:00
hjk
8628150ffc Qnx: Give Slog2Info runner a display name
... for better debugging.

Change-Id: I24d2c6d10d659287ae61fdb4db735e658e3a68ce
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-06 14:25:24 +00:00
BogDan Vatra
1f4e78d8a6 Android: Fix search path for QML modules
QT_INSTALL_IMPORTS was used by Qt 4.x, Qt 5.x uses QT_INSTALL_QML

Change-Id: I9c25ef005f3c5dc8cfc8d0b965426e22b542fb70
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-06 11:55:23 +00:00