Commit Graph

53197 Commits

Author SHA1 Message Date
Eike Ziller
2897414d3b Add std::hash for FileName
Change-Id: Iaef49c826c0febf3a9cb1fdc97de9f92c261cf40
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:37:11 +00:00
Christian Stenger
cce1e130d7 AutoTest: Fix handling of multiple build targets
If project files are not mapped 1:1 to targets the result
of the chosen executable was more or less random.
Try to handle multiple targets as correct as possible by
checking for build targets already where we still know
which files are part of the respective test cases.

Task-number: QTCREATORBUG-17783
Task-number: QTCREATORBUG-18357
Change-Id: I82dcc26bf52c9918e2727b439a719af08879ef49
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:14:55 +00:00
Christian Stenger
bde8ebc56c QbsPM: Re-introduce uniqueProductName()
This patch prepares for enhancing information stored inside
buildSystemTarget.

Change-Id: I5d81fd01ab6b06c162f47fd9536de697ddfd24a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:14:39 +00:00
Orgad Shaneh
a36536813f VCS: Set user choices on editor reload
Broke by 2c6adc1e74.

Change-Id: Iba435899c7b0da4b270f4ef8ece84c1839bf6b72
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:08:02 +00:00
Orgad Shaneh
b57553b7a2 QmakePM: Fix redundant execution of qmake on build file
... when Makefile is customized.

The resolved makefile was <directory>Makefile.custom instead of
<directory>/Makefile.custom.

Change-Id: I01c4ef8b6d4ba64fc6663219c2eab7a39e03888b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:07:08 +00:00
hjk
771d9f222c Debugger: Make 'Debug all children' label a bit clearer
Change-Id: I02f0ca307bff01745f75fa1cf9c149b867577f7f
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-19 07:53:09 +00:00
hjk
bfb0e025d9 Android: Make selector() arguments to runAdb implicit
Less code on the user side.

Change-Id: Ibf19ca725557c2de67743bd3b4b621f04bb896c7
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-19 07:52:37 +00:00
Christian Stenger
ea86ff5eb0 AutoTest: Avoid triggering run tests while building
Disable respective actions while a build is running to avoid strange
side-effects or race conditions.

Change-Id: Ifc8d1c9fc9fd4d705cabd148b145708e23029dba
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-19 06:59:08 +00:00
Christian Kandeler
70e6bb2827 QbsProjectManager: Allow to import builds
Task-number: QBS-1059
Change-Id: Ibf45fbd870eb22f79883331f6559e1487df25ad0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-06-16 16:02:01 +00:00
hjk
a25f394f68 Debugger: Add dumper for std::{optional,byte} and gsl::{span,byte}
Change-Id: I7e06214bfd2ace91f480b73bb370e5dc6297c502
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-06-16 15:31:31 +00:00
Eike Ziller
76a07a453e Locator: Rename show -> showText since it collides with QWidget::show
Change-Id: I9f99ef14c318e54ddb84a462e767d2f1c1e2f3ec
Reviewed-by: hjk <hjk@qt.io>
2017-06-16 15:01:26 +00:00
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
1623af0da5 Clang: Add a disabled test for highlighting
In the example below, "var" is highlighted as a function, but it should
be highlighted as a local variable.

  struct OtherOperator { void operator()(int); };
  void g(OtherOperator o, int var)
  {
      o(var);
  }

This is due to a libclang bug.

Change-Id: I7c9fcad6f16c25191d31fc330e969ebd282d4869
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 06:09:19 +00:00
Nikolai Kosjar
cde8738269 Clang: Remove pointless call in tests
It was added only for debugging.

Change-Id: I7ea80d8d472f319cdcac548d3abf602e0f304fc9
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-16 06:08:58 +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
Jarek Kobus
dad2c11d3a Update Polish translations
Change-Id: I35cdd493dca5fb0e105a029880ea3f5b66b2dfef
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2017-06-15 15:53:18 +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
Robert Loehning
8016c56268 Squish: Stabilize tst_generic_highlighter
Starting a download while another is still running will open
a message box which causes an error when trying to click.

Change-Id: I4f26e07ba70181d009dfa71318783725adad3227
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-15 13:09:58 +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
b8f1b43b4c Scripts: Add ninjawrapper.py
Add a small python program to wrap ninja and split its output nicely
into stdout and stderr.

Change-Id: Ib2fae405c170ea15910de20d5f45aaab75aa89cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-15 08:43:21 +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
a570614f3c Clang: Fix test file name
Change-Id: I27b25e4b8521aabab804812c4cc27cd41c23b46e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-06-15 08:00:34 +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