When removing a project setStartupProject(nullptr) may fail, since
it will reject any attempt to set the startupProject to nullptr while
any project is still available.
So delay this till nullptr is an option:-)
Change-Id: I6f41a17d922cf6333b7b7e17f8300e831e4807d9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This fixes a number of deprecation warnings. The require() function was
introduced in qbs 1.8 and is safe to use now.
Change-Id: I915a9f62f36fc64086c7dce60ea753d3e564127c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
It is only used for Rebasing message in Git, which was moved from
stdout to stderr on Git 2.12.
Change-Id: I761cb7ac4e0d19fc28b323076dd3b0919535ed32
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Use local variables to avoid duplication
* Correct the regular expression:
instead of (?<=...)(C|(?<=...)c) create
(?<=...)(C)|(?<=...)(c)
Change-Id: Ibf65ab118017fa67db1cb0efa4eb82a4e36f284c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Moving the knowledge that this won't work well outside windows
kind of decreases encapsulation, but that's not really worth the
complication of the error handling here.
Change-Id: Idcb6f6d64f33ee8c49a01e62e20aad16d3f01b86
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
We also need to update the static cache of the root directories and
their properties, otherwise it will be wrong for file system panes that
are opened afterwards.
Change-Id: Iaf96f2728132e7c2f349095b347b13f833ccc732
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Improve findLocalCompiler to better match the semantics of icecc/distcc.
Task-number: QTCREATORBUG-18902
Change-Id: I06e7957d37bff449ce0188dd5d19e88d25f8e459
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
As indicated by the removed comment, the original version was
way too complicated.
Change-Id: Ie5d8d8fbe7bd8e44e0538117cd2aaa73958f7d8c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
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>
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>
Now it's in accordance with clangrefactoringbackend/source and
clangpchmanagerbackend/source.
Change-Id: I939cfc72cffb8fcde0649f125e6efb6670d1cbc3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
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>
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>
...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>
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>
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>
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>
