Commit Graph

44349 Commits

Author SHA1 Message Date
Christian Kandeler
43a7fa28b1 Update qbs submodule
To HEAD of 1.8 branch.

Change-Id: I4bb157ec17aa25a3df6c4fedd89e332f167935ab
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-06-16 13:54:01 +00:00
Tobias Hunger
abdc6790ee VcsManager: Use nullptr and member initialization
Change-Id: I7a04d609f62d1a221eb2b814a67b2dd816d90e6c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-16 13:39:28 +00:00
hjk
232fb7a425 QmlProfiler: Split server url passing from custom startup request
Orthogonal concepts, that only happen to coincide.

Also, make the server directly settable instead of relying
on the runControl's connection().

Change-Id: I2472acafcc50aede2cb6f99421901f0e67531b91
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-16 12:55:21 +00:00
Eike Ziller
923c20bd9c Locator: Move filter action creation out of input field widget
Change-Id: I380e28444b33caa2c3c2724ad2933a13fdcb312a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 12:20:50 +00:00
Eike Ziller
93f4fb771f Add std::experimental::optional as Utils::optional
Uses the reference implementation of the proposal, which later
can be replaced by the std lib implementation depending on compiler
and used C++ version.

Change-Id: I23f2f8077f4cb26c3d9a403b1ce438b6cdb163f2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-16 12:19:27 +00:00
hjk
42580c7d0c ProjectExplorer: Expand %{Device:Name} to device()->displayName()
Change-Id: I9ae7bc0f55933c83aaefb0d1df8e9873386f36a7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-16 12:19:26 +00:00
hjk
25a75d3fa3 Debugger, QmlProfiler et al: Replace AnalyzerStartParameter
... and QmlProfilerRunner::Configuaration by PE::UrlConnection,
and call it 'serverUrl' on the user side.

That's the only variant we ever had and avoids "translations"
between three structures that are essential the same.

Change-Id: I33386b2b8d2a7985ff934f6f8f840de0831bf9c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-16 12:19:16 +00:00
Christian Kandeler
bb4edc33fd Toolchain support: Better detection of cross-compilers
For instance, executables like arm-linux-gnueabihf-g++ or x86_64-w64-
mingw32-g++ are now detected as gcc and mingw toolchains, respectively.

Change-Id: Ia0884215969ae66613cc709bf02fcf32a67da207
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-16 10:39:46 +00:00
Robert Loehning
b5c482a906 QmlDesigner: Remove double negations
Change-Id: Ifd5900ebf1e42c6fd8a762e24763c986228ef39d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-06-16 09:16:16 +00:00
Nikolai Kosjar
0bc782c468 Clang: Add CLANG-UPGRADE-CHECK marker
...for things to watch out on an upgrade.

Change-Id: I75b77a3c8fa238939b625d084c7db220ab429319
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 07:11:43 +00:00
Nikolai Kosjar
d573aebf12 Clang: Remove pointless code
This was some intermediate state.

Change-Id: I1390d9b4721a53a08ecc6b6d346dd1e2d9468989
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 06:08:49 +00:00
Mitch Curtis
065e38f5d5 Revert "prepare "new file dialog" for bigger icons"
This reverts commit 62f62fbe7a.

We’ll stick with a vertical list view for now, as the default size
of the dialog is not large enough to show many items in a grid.

Change-Id: I03ce2f01ecc59266f24ee0d88014848580689536
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-06-16 06:03:14 +00:00
Przemyslaw Gorszkowski
7bcf483189 C++: fix code completion of stl containers in internal code model
This fix makes some trick and replaces existing typedef of 'pointer'
to the simplest one(only in class unique_ptr), e.g.:
template <class _Tp>
class unique_ptr
{
  typedef some_strange_things pointer;
  pointer operator->();
}
is replace with
template <class _Tp>
class unique_ptr
{
  typedef _Tp* pointer;
  pointer operator->();
}

In most of the implementation of unique_ptr it should work.

Similar approach is done for std::list, std::vector, std::queue, std::set,
std::multiset, std::unordered_set.

It is done in this hacky way to omit problems with cyclic and complex
resolving of typedefs.

Change-Id: I1363dfc5e23d3cd2fa7af7fc27423bfbac2d894d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-15 17:18:20 +00:00
Nikolai Kosjar
d3d3e2ace5 CppTools: Simplify/Modernize SemanticInfo
Change-Id: I7bef1dee81678f77f5c0d8a6d22488aa63f981e7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-06-15 15:11:48 +00:00
Tobias Hunger
210b9aa227 CMake: Provide more information in server-mode
Provide more information about what is happening in server mode.

Change-Id: I69cbf0b2cb197789231499ac601a08af33ed6b6e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-15 13:28:41 +00:00
hjk
057361dc24 RemoteLinux: Re-enable QmlProfiler
Change-Id: Ifc943c785f94dcd11fae74acdd8c1bf96712ca35
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-15 12:31:17 +00:00
Christian Kandeler
aedcccd78f Update qbs submodule
To HEAD of master branch. One API adaptation was required in
QbsProjectManager.

Change-Id: I59dd76ffa0381d13b4d5f4b4609e85cf73ab32c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-06-15 11:54:55 +00:00
David Schulz
6036739e0c Editor: Separate color and id in the highlighter scrollbar
This allows to define a color for each highlight, and not just for
groups.

Change-Id: Ia027f1fb42a96c431b5889ec132a59b16ae41fbb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-15 11:52:47 +00:00
Christian Kandeler
b5c8428285 QbsProjectManager: Delete ProjectDocuments along with project
The documents have a reload callback that accesses the project. This
would lead to a crash on a reload for a document belonging to a closed
project.

Change-Id: I171cacd0da347fb279609baaea4050ba1cc12008
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-15 10:00:40 +00:00
Eike Ziller
395dd94c39 Revert asConst for rvalue refs
The rvalue refs go out of scope too fast, that's why it must be disabled
(as it is for qAsConst).

This partially reverts commit 0316219f8d.

Change-Id: Ie2a88400922f0275203a61e4070fe66f2a1fbc7b
Reviewed-by: hjk <hjk@qt.io>
2017-06-15 09:49:31 +00:00
David Schulz
2b83869236 TextEditor: Animate navigation within file
Change-Id: I490d70a785c947cd41809503e15a317152126641
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-06-15 09:24:07 +00:00
hjk
752662e478 DeviceSupport: Report success for attempts to shut down port gathering
Change-Id: I02892243c4e3a9ef8d67e856c82ee953482534b2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-15 09:16:10 +00:00
Nikolai Kosjar
60d1f35555 Clang: Fix MSVC2015 build
Change-Id: Ife8c2d0be9e82bb897cd4612d24e2b893ffb792d
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-15 09:05:07 +00:00
Tim Jenssen
ca39f63b33 Wizards: Remove QLatin1String from JsonFieldPage
Change-Id: I91e69c80c62ac6f77fd1823f246097355cd81286
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-15 09:02:15 +00:00
Ivan Donchevskii
c62b6a5fa0 Clang: make correction whithout proposed items
Make . to -> correction even in case code assistant
has no items to propose.

Change-Id: Ie16d317c1a55f05883d3de5ba9bd475d315c59a9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-15 09:00:07 +00:00
Tobias Hunger
784f807c1b Autotools: Fix autotools project tree
All nodes in the autotools project tree were of type Resource, which
resulted in strange behavior:-) Get the proper type instead. Apply
some no-risk cleanups while visiting the code.

Task-number: QTCREATORBUG-18371
Change-Id: I370846100239cca91683dd184a1e5a56d3543732
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-15 08:53:06 +00:00
Joerg Bornemann
19ea705913 Fix namespaced build
Change-Id: Ie0f48ce209f3242f3f07b5f89e6c681f4dd7f810
Reviewed-by: hjk <hjk@qt.io>
2017-06-15 08:46:53 +00:00
Tobias Hunger
8d49e4be68 Qmake: Fix AddLibraryWizard
The wizard could not get triggered from the
top-level node of a project.

Task-number: QTCREATORBUG-18263
Change-Id: I5b063c64a9931f266e79b62bea8b2d225890a4f1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-15 08:17:24 +00:00
Nikolai Kosjar
e6a4041003 Clang: Remove pointless member variable
The called function uses already static state.

Change-Id: I22c6cceea6c0c779c4b8ca94b74e0828e27b1f4e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-15 08:00:26 +00:00
hjk
f99352df5c Debugger: Add a display name to GdbServerPortsGatherer
For debugging reasons.

Change-Id: I8136bbfb9a6558ab89f775e8e1410081cda3f95d
Reviewed-by: hjk <hjk@qt.io>
2017-06-15 07:47:13 +00:00
Vikas Pachdha
50856d766d iOS: Fix run issue on iOS with xcode 8.3
Changed the algorithm to find the appropriate DeveloperDiskImage

Task-number: QTCREATORBUG-18380
Change-Id: I4e3ddbc8cfd856f6a503cfa42cb9cc319a21a0c9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-15 07:42:11 +00:00
David Schulz
e199ab57d8 ClangCodeModel: Fix compile after ca72c29462
Change-Id: I7a720ce13741cb663628798078c74c98314905d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-15 05:28:22 +00:00
Christian Stenger
f16339f18d CMakePM: Ensure buildSystemTarget is initialized correctly
This ensures the buildSystemTarget will not set to an empty
string and not contains path elements.

Change-Id: Ib993fb3a64a277490e6596cc0662a781d89a4c49
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-15 05:17:24 +00:00
Denis Klychkov
1b9e2f76d0 VCS: Fix lost extra options when executing diff and log in VcsBaseClient
Task-number: QTCREATORBUG-17987
Change-Id: I7480669d75137b0791236dce6b9c096c47276365
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-06-14 18:37:27 +00:00
Orgad Shaneh
28e8960a1e VCS: Filter out untracked files only if they don't appear in any project
Change-Id: I9a87f082467f4688c1ebe5dd5e832c9e5a684ca1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-14 15:01:12 +00:00
Ivan Donchevskii
ae10749ffe Clang: Fix slots and function pointers completion
Check completed functions for preceding & and
don't add parantheses in that case

Task-number: QTCREATORBUG-17578
Change-Id: I21b1e2c9ffb9d288f3267146e9afd575e6fef30b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-14 14:42:11 +00:00
Marco Bubke
ae485ac551 Clang: Return ClangString instead of Utf8String
Utf8String is allocating memory but for many compares it is not needed.
In an inner loop this can be expensive.

Change-Id: I6320823ab7e086008447eea255e52859a7faaad7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-14 14:04:49 +00:00
Ivan Donchevskii
02194a5542 Fix build (windows)
Change-Id: Ic57f7f633b73abec26f1d6b9f62ff6d4612911ea
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-14 14:01:32 +00:00
Ivan Donchevskii
33a2288c7d Clang: Fix extra space before left paren
Do not add space before left paren in function
because it must not be there

Task-number: QTCREATORBUG-14878
Change-Id: I0fd0e650aeeee59af7bbc157c2fae652109763bc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-14 13:06:47 +00:00
Nikolai Kosjar
ca72c29462 Clang: Provide highlighting for identifier under cursor
Change-Id: I80ffe23cbcc84ab7323124581d9dd6afbe974fd0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-14 12:49:05 +00:00
Nikolai Kosjar
9de9da7423 CppEditor: Do not start CppUseSelectionsUpdater for same identifier
Saves some cycles when navigating with the text cursor over the
characters.

Change-Id: Ie9a23d97ac09ca45a32178cae5b8945d0c623811
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-14 12:35:26 +00:00
Nikolai Kosjar
38789eb0a6 CppTools: Use class member prefix "m_" in builtincursorinfo.cpp
Change-Id: I8e4079734f9167dcc9da2ceff027f8559bab367f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-14 12:33:22 +00:00
Nikolai Kosjar
fdf0a104ec CppEditor: Generalize CppUseSelectionsUpdater
Let CppUseSelectionsUpdater delegate the work to
*EditorDocumentProcessor so that the clang code model can also provide
results.

Change-Id: I6872afbfeea1a5c4a64fdf19fcb1992f134dde08
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-14 12:24:59 +00:00
Christian Stenger
706da24733 QbsPM: Fix compile with Qt5.6
Change-Id: I21855bfd173ad6e85329d83b2337efc37359be6e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-14 12:22:20 +00:00
Nikolai Kosjar
18bdbe1b0f Clang: Do not expire job requests with newer document revision
...than currently reflected in documents. Otherwise such requests expire
immediately.

Needed for a follow-up change.

Change-Id: I456aea02a0fee9b9602a59a99943da13a01472d9
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-14 12:05:18 +00:00
Marco Bubke
bc22192813 Sqlite: Fix compile
Change-Id: I098ba3f2a896f3f1f675a81b48cd41364aeaa631
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-14 11:49:33 +00:00
Nikolai Kosjar
de5cbacae5 Clang: Rename JobRequest::Requirements to ExpirationsReasons
...to avoid ambiguity in regard to a new enum in a follow-up change.

Change-Id: I4f732b5200ed674b6708510ac8de0a795afe52da
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-14 11:48:54 +00:00
Nikolai Kosjar
e8ce2e62d2 CodeAssist: Do not retrigger completion when applying a snippet
This fixes the following case for the ClangCodeModel:

 1. Trigger non-member/non-prefix completion.
 2. Choose the generic "class" snippet.
    --> The snippet is inserted, cursor is right after "name", but it
        also triggers another completion that proposes e.g. the "namespace"
        snippet.

This does not happen with the built-in code model because at that cursor
position it provides "name" as completion result, which is a perfect
match and thus suppresses the completion list.

Change-Id: I2f797469b2a0952406b50c28f9704b113e19b16d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-14 10:43:36 +00:00
Marco Bubke
43d6726c70 Clang: Add equal operators for ClangString
Converting them in a Utf8String in an inner loop can be quite heavy.

Change-Id: I4f2ccde47a6e3ca08ed054462eb7772ded9e55c9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-14 10:14:07 +00:00
Marco Bubke
f22bd9dc4c Clang: Fix warning in HighlightingMark::punctuationKind
Actually mixing returns and not is not that well readable workflow. A other
option would be to use if.

Change-Id: I36f07adb77d50ddc6890b6292c7883a1b5f80f58
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-14 10:07:20 +00:00