Commit Graph

52923 Commits

Author SHA1 Message Date
Eike Ziller
e0639d0696 Fix reload issues for files with multiple registered documents
If a file is removed, the file system watcher can loose its watch
on it (e.g. on Linux, inode-based).
Saving files does so "safely" by writing a temporary file, moving
the original, and moving the new file in its place, which is
triggering the issue above. That is why we need to re-register
the path in the file system watcher.

This broke in the refactoring done
by 05485071b0

Task-number: QTCREATORBUG-18892
Change-Id: I3b216d614b9f82e308da63c07d990e5911193655
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-29 06:48:49 +00:00
Ryuji Kakemizu
fc4bc59fd5 Fix deployment to Windows 10 Phone Emulator
Change-Id: Iaedee9ee61c3bf6b628a2f3d6480b980ddac54f2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-28 16:47:02 +00:00
hjk
b58f695cf8 ProjectExplorer: Sort dependency names alphabetically
Task-number: QTCREATORBUG-18843
Change-Id: Iba25e9ea292b34a7479e0456d005d02b678477f5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-28 14:58:20 +00:00
Laurent Montel
fd2cca08c0 qmljseditor: fix forward declaration
Change-Id: If44cf14eb04c74a164d6b3cd68cd5a114fff1533
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-28 14:57:06 +00:00
Nikolai Kosjar
087ea0e531 Clang: Rename directory ipcsource to source
Now it's in accordance with clangrefactoringbackend/source and
clangpchmanagerbackend/source.

Change-Id: I939cfc72cffb8fcde0649f125e6efb6670d1cbc3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-28 12:45:41 +00:00
Nikolai Kosjar
917592970d Clang: Extract and rename backend classes
IpcCommunicator -> BackendCommunicator
IpcSender -> BackendSender
IpcReceiver -> BackendReceiver

Change-Id: I110ebe8d185db7ff47d2d5de9b786262520926d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-28 12:45:31 +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
Laurent Montel
227acdea75 TextEditor: Clean forward declaration
Change-Id: If338617551893e3ce3c7a68ff1abfc60de8cf610
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-28 09:39:46 +00:00
Andre Hartmann
f792475739 CamelHumpMatcher: Fix matching word continuations without hump
Let the search string "window" also find "mainwindow.cpp",
not just "MainWindow.cpp"

Task-number: QTCREATORBUG-18957
Change-Id: Iace3111fb3ce319d916362c1f8d396844a3bc47a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-28 08:04:43 +00:00
Laurent Montel
b35fe9bf53 timeline: fix forward declaration
Change-Id: Ic69e6559826050adabd3f39e7b936f98d8069621
Reviewed-by: hjk <hjk@qt.io>
2017-09-28 07:53:35 +00:00
Laurent Montel
8883d496b3 Help: fix forward declaration
Change-Id: I88b5cca65d7e98e7f9d9e5d082cc137e822bc9b4
Reviewed-by: hjk <hjk@qt.io>
2017-09-28 07:53:26 +00:00
Laurent Montel
f75379ddcf Mercurial: fix forward declaration
Change-Id: Iacd804231c84881de553e6b5d7d66f6b8731e70e
Reviewed-by: hjk <hjk@qt.io>
2017-09-28 07:53:15 +00:00
Laurent Montel
67646cb026 autotoolsprojectmanager: fix forward declaration
Change-Id: If710c026bb40735a4437cce8ca3e7c32c619d202
Reviewed-by: hjk <hjk@qt.io>
2017-09-28 07:53:06 +00:00
hjk
0c8283234a Debugger: Simplify GdbEngine construction
Change-Id: I4af1cb7d7480b1db68693881254cbc89d985c33e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-28 07:52:16 +00:00
hjk
b11f304ffb Debugger: Remove more non-const acccess to start parameters
Change-Id: I1311b652bb56ef4b9b51cca6b39be2b2215e0074
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-28 07:42:24 +00:00
Laurent Montel
ac6055eeb0 Git: clean forward declaration
Change-Id: Ic8e988d9fa27f9e92fdcfe111220a5c929998afb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-28 07:05:19 +00:00
Friedemann Kleint
3edc50a164 README.md: Update Clang repository URLs
Change-Id: I5112052032e128144b346fac49076a458647f7db
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-28 06:26:22 +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
Laurent Montel
3ddba62aff Valgrind: fix forward declaration
Change-Id: I6fe6a903451a40214224319a5245d57488d9cf05
Reviewed-by: hjk <hjk@qt.io>
2017-09-27 14:24:26 +00:00
Laurent Montel
7c064d3921 CorePlugin: Clean forward declaration
Change-Id: I37c381bc26a29acae1bfe0e49f2772b4e92cf046
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-27 13:08:46 +00:00
Eike Ziller
e3a692a1a4 File System view: Fix that projects could be duplicated
It is not possible to use the display name as an ID, because that can
change (and to propagate that change we use the ID).
Remove the display name from the ID, use a separate sort property, and
sort by this property + display name.

Task-number: QTCREATORBUG-18972
Change-Id: I27017473842931defa3a123ce9f41cc8e8ba1a61
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-27 12:37:53 +00:00
hjk
895acd23e3 Debugger: Move external terminal into separate RunWorker
Change-Id: Ifb9701f840195ba90db48a0f6fa07b28e0409648
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-27 12:16:19 +00:00
Laurent Montel
6f481bd9da CPaster: Clean forward declaration
Change-Id: I05126edb499cff64bd83839933ad831d9845e0e3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-27 09:54:16 +00:00
Claus Steuer
4c04cff7c1 AutoTest: Test execution from result output pane
Enable test execution via context menu in the result output pane.
At the moment only gtest is supported.

Task-number: QTCREATORBUG-16695
Change-Id: Ib39164c3cb44d249647b11e25dc51c9ac5db89c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-27 09:47:28 +00:00
Thomas Hartmann
8b80442131 QmlDesigner: Add support Qt Quick 2.10
Change-Id: Ic6ba5224c8b70bab60e903a8e159749a69f7818e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-27 09:34:36 +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
0269bf537b Macros: Modernize
* Replace 0 with nullptr
* Remove redundant pimpl
* Use inline member initialization

Started-by: Laurent Montel <laurent.montel@kdab.com>
Change-Id: I15ace2581c13ecf24b7c947972b9435fbcaa12ab
Reviewed-by: Laurent Montel <laurent.montel@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-27 08:17:08 +00:00
Nikolai Kosjar
e99b86e8ca Clang: Remove IpcSenderInterface
Change-Id: I005ab86d0967b439421a217556a39f2416976f20
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-27 08:07:30 +00:00
Nikolai Kosjar
576ae5e132 Clang: Remove test testUpdateBackendAfterRestart()
* It's skipped / must be rewritten.
* It does not belong to ClangCodeCompletionTest

Change-Id: If6708d28602cc8c3478a968b87bae542ae859590
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-27 08:07:24 +00:00
Laurent Montel
d0f59c0949 CppEditor: Clean forward declaration
Change-Id: Id2a4d203e7a0c3405ca612aeb294b25be8a37323
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-27 07:55:18 +00:00
Alessandro Portale
c4438cc4c3 Qnx: Have a proper default device icon
Themable and HighDPI-able.

Change-Id: Ieefa19f3a569d9b9fbb3349f9bb6ac67453eff1f
Reviewed-by: hjk <hjk@qt.io>
2017-09-27 07:47:50 +00:00
Alessandro Portale
aeeeffbe68 qtcreatoricons.svg: Pacify recent Inkscape versions
Since a few versions, Inkscape wants to add a inkscape:locked to
guides. In order to have less patch cleanup duty for each svg
commit, we just concede that to Inkscape.

Change-Id: I8c096b7db15dc776976281cf9d20444e1654bb01
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-09-27 07:47:23 +00:00
Laurent Montel
784d9a6279 QMakeProjectManager: Clean forward declaration
Change-Id: If2a70a5b39b999119cb02c84b72a5a13891661dc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-27 07:46:27 +00:00
Laurent Montel
b89cd0a78a DiffEditor: Clean forward declaration
Change-Id: Ifedc0041a5a7d736231057c092f430061c62f8fb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-27 07:46:16 +00:00
Laurent Montel
7dafb822ed CMakeProjectManager: Clean forward declaration
Change-Id: I47cb6fbac276554e548383fe6945fd5cd38386c6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-27 07:46:06 +00:00
Christian Stenger
211dad0325 QmlDesigner: Fix translatable string
Change-Id: Ie116f05ee8a8c65f470b3bdd6363a92ca43f6acc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-27 06:29:40 +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 Stenger
f075568197 QmlDesginer: Fix compile with Qt5.6
Change-Id: Ifc4468ef4367ffd44a7ab9e9e51444f62fd88990
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-27 05:48:45 +00:00
Eike Ziller
e8fecc6d08 Merge remote-tracking branch 'origin/master' into 4.5
Change-Id: Ic3a34b18708d637c94000e9bb3cad1b500e7356d
2017-09-27 06:34:25 +02:00
Robert Loehning
6d60aae8ef QmlPuppet: Check return value of fstat
Change-Id: I2b7c04712a883455d8a5a0daa1225c2ef84a0748
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-09-26 16:44:58 +00:00
Thomas Hartmann
2c2015970f QmlDesigner: FormEditorToolButton needs Arrow curser
Since the selection and move behaivour changed and the
label is now a move gizmo, the
FormEditorToolButton needs an explicit arrow cursor.

Change-Id: I10eb37dab39160e6854dfc57d206f6f5f1c2bc68
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-26 14:33:45 +00:00
Tobias Hunger
23a04c6592 Subscription: Handle already set up children
Auto-connect to children that are already connected when subscribing
to their parent.

Change-Id: I20cc76c818db5ad90dc126bdb8393506403dc4b6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-26 14:31:50 +00:00
Tobias Hunger
08677c0b01 CMake: Quieten soft-assert on small project loads
The directory tree scanner and the project parsing work independently of
each other. Add logic to combine these two sets of results into one
parsing state.

Change-Id: I46e94f0e866b40ee7225235c536c742cecf11b45
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-26 14:31:25 +00:00
Orgad Shaneh
a8410721be Qbs: Add variable chooser to Run Configuration widget
Change-Id: I8b52b4021e640232e722f33ce20229fe4c7280c7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-09-26 14:09:31 +00:00
Tim Jenssen
c9f48f87e2 MiniProjectTargetSelector: Trigger less list updates
Change-Id: I39634ef201ac4a12d5ea114843c73e4558015c05
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-09-26 14:08:53 +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