Commit Graph

45338 Commits

Author SHA1 Message Date
Tobias Hunger
869c46227d CMake: Only use ninja if that is found in PATH
Only use ninja by default if that is found in PATH. Still prefer ninja
if it is available as that apparently is a huge time saver, especially
on windows.

Change-Id: Iadaecbaddfe6592222f2ed5e42b440665e9246a7
Task-number: QTCREATORBUG-15756
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-01 10:12:40 +00:00
Orgad Shaneh
925492a1b3 QmakePM: Avoid multiple loads of the same standard icon
Loading a standard icon is expensive.

Change-Id: Ic6bae20c9d0bdcb07fda48309bebcc3a959bc031
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-01 10:06:50 +00:00
Ulf Hermann
dfa8e27968 QmlProfiler: Check runConfiguration for 0 before accessing it
Change-Id: I274d7a75313a899a2b0c05fddbe8e189f9b99156
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-01 09:00:31 +00:00
Orgad Shaneh
7026b26c49 Debugger: Do not set the current executable by default
Only when the user requests.

Change-Id: Iaae1acb879dc99bcb0cb4d15f92f685b17829a8b
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-01 07:04:09 +00:00
Christian Kandeler
f900b4e1ba Selection changer autotest: Fix build with namespaced Qt.
Change-Id: Ic9709ac4e76a199bb9fdd7ed231d48d498201de6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-02-29 15:14:37 +00:00
hjk
a26d5ece43 QmlProfiler: Avoid use of Analyzer::createDockWidget return value
In a quest to make the function return 'void'.

Change-Id: I36635c89948ded84b89861f169303a00bf2ea6bf
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-02-29 15:03:58 +00:00
Tobias Hunger
78074999f6 PNGs: Remove sRGB chunk
libPNG does nag about broken/useless sRGB headers on the console for a
while now. Remove them from our PNGs to stop that text from appearing
in the console on startup.

Change-Id: I2f49f892397bf9d4498ac39210fd6d1d4f29269e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-29 13:28:51 +00:00
Christian Stenger
7985b518c2 Valgrind: Avoid soft assert when no project is opened
Change-Id: I3ff8a3dbc3b6115824477e307c03d9a2c0d19285
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-02-29 13:06:46 +00:00
Tobias Hunger
102135a768 GLSL: Fix warnings about inconsistent use of override
Change-Id: Ice4cf80141c5cb3c250c1c01fb70e6db8d1abe29
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-29 12:52:09 +00:00
Tobias Hunger
a286c8da44 ApplicationLaucher: Catch late WinDebug messages
Catch and display messages received from WinDebug interface, even
for a short while after the process has already finished.
This can apparently happen, e.g. when doing a qDebug right before
the application ends (and QT_LOGGING_TO_CONSOLE is not 1, the
application is being run in GUI mode, on windows).

Task-number: QTCREATORBUG-15546
Change-Id: I37a015da89fc409234adeb597171fa328f50c14d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-29 12:51:39 +00:00
Orgad Shaneh
13c3972a75 ExtraCompiler: Use a hash for contents
Avoid recurring scans of the targets.

From a simple test, there is usually a single target. This is mostly
done for correctness.

Change-Id: Ic025de0825133f1096c400278c929a7e9087c643
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-02-29 12:43:19 +00:00
Friedemann Kleint
4eeb9dc0c3 ProjectExplorer: Enable the document factory to handle directories.
Register the mime type inode/directory and use it to open
project files in that directory.

It is then possible to drop directories on the main window
which will cause the contained projects to be opened.

Also allows for simplifying the code in the command line handling.

Change-Id: I92138915216b1346a36b5ca7654cf2b7d6f405c4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-29 12:13:58 +00:00
hjk
9c7146a881 Valgrind: Always use global settings if no project is loaded
Change-Id: Id52ec4fff052cbbafef1c83c1a864e259c55b148
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-29 12:02:57 +00:00
Tobias Hunger
5a04c8b06a Session: Modernize code a bit
Change-Id: I6459da31592a391533f7eb062e1b9f1bb9dabc78
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-29 10:50:25 +00:00
hjk
931ee3382c Analyzer: Rework the dock widget layout generation
Decouple layout generation from widget generation and
separate analyzer action description from menu action creation.

Tool specific layouts are named "Perspective" now.

Change-Id: I774efe77a07640c4cc26e4e566662c8a673c8831
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-29 10:47:43 +00:00
Christian Stenger
04cbf8b818 AutoTest: Support find in results pane
Change-Id: I899325dd87439d6bea22fa52aed640fa8158e113
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-29 10:19:27 +00:00
Eike Ziller
b692c1379a Merge remote-tracking branch 'origin/4.0'
Change-Id: I108ad07980360acfdce523d6674b2480a9b027e8
2016-02-29 10:41:30 +01:00
Eike Ziller
4b30b30d6d Merge remote-tracking branch 'origin/master' into 4.0
Change-Id: Iad8f5ab4bc44e890cd0c72d5bcbceb6f18f6e995
2016-02-29 10:38:16 +01:00
Lorenz Haas
2d7f9c56d5 Beautifier: Refactor formatting API
Break former monolithic methods into modular ones and re-introduce
synchronous formatting.

Change-Id: Ic4d8cbe451f028c7a3677570242cff9a2e362384
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Marcel Mathis <marcel.mathis@komaxgroup.com>
2016-02-29 08:57:16 +00:00
Alexandru Croitor
bed88818ce C++: Implement context-aware expand / shrink selection actions.
Implement selection expanding / shrinking, that is aware of C++
semantics, thus giving smart selection changing.

Change-Id: I1386a20597fa6bb85c3aa0d8ddfb87cdb3fd7c38
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-02-29 08:15:03 +00:00
Orgad Shaneh
bc9ffac3c0 MimeTypes: Increase weight of common source types
To avoid expensive matching by glob or by contents.

Change-Id: Id873c02369915642821872d10b566006cc2be39f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-29 08:02:46 +00:00
Alessandro Portale
8bfdc82c5a FancyLineEdit: De-duplicate some code
Change-Id: Ia9bf5db44d4546ae756d2d4ecca3c4057076f69a
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-26 15:29:21 +00:00
Tobias Hunger
550a11a876 ProjectExplorer: Fixed "New file" dialog population.
Fixed a regression introduced in d5e7262e68.

Task-number: QTCREATORBUG-15696
Change-Id: I97121709f538b5abc8660c2f18bea256db2f26cc
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-26 14:07:25 +00:00
Eike Ziller
6d4abdc801 runAsync/mapReduce tests: Do not run moc on files from utils lib
Change-Id: I96cccbe9a2f617e0255bbedfae021d08c546fc8c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-26 13:43:32 +00:00
Tobias Hunger
049675077a QMake: Fix layout of qmake makestep
Use a gridlayout in favor of a formlayout. That increases the
minimum size of the widget.

Task-number: QTCREATORBUG-15793
Change-Id: Iac6be373f6bdbc5e9384e2713db57bfc38f0432c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-26 13:24:33 +00:00
Alessandro Portale
2f735a126e Dark theme: Fix selected sidebar button background
One of my recent changes must have broken the selected background color.

Change-Id: I4ed79b29193bddb4423273f65562d20e54361f9a
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-02-26 13:22:12 +00:00
Robert Loehning
8e6765df23 Squish: Update tests using clang code model
Code models can't be swapped at runtime anymore.

Change-Id: I76a9894d0413d7d5a368ec6d506180a3837a6e2c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-26 13:06:24 +00:00
Eike Ziller
24967cbbb5 Merge remote-tracking branch 'origin/4.0'
Change-Id: Ied9fbfc655aac9e04df16f2ad9b4f22fe05a1ba9
2016-02-26 13:58:28 +01:00
Eike Ziller
84dd62308c mapReduce: Fix MSVC2013 build
Looks like it is a problem that the void template specialization
for dummyReduce didn't have operator(), but the non-specialized one
had, so resultType<dummyReduce> failed.
It also seems that passing function pointers (to template functions?)
morph into function references somewhere, so we need to sprinkle
std::decays over the place, which is the right thing anyhow, since
they are decay-copied into the thread eventually.

Change-Id: I832474d1a6c3ecef55bfac9339d5e18b6ce910cc
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-26 12:57:22 +00:00
Jochen Becher
4d91194e8f Modeling: Fix build with/without SVG
Change-Id: I5152571010fecaf91986a16ca71bf7b89fada064
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-26 12:25:18 +00:00
Tobias Hunger
420e54281c CMake: Keep cmake state in a temporary directory till first build
This avoids creating lots of build directories as the user types
in something into the builddirectory line of the build settings.

Change-Id: Ib08a0f65e08bce104e4baf9e19fb01730d2f5f08
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-26 12:17:39 +00:00
Tobias Hunger
76a050cb83 CMake: Move BuildDirManager from the project into the buildconfiguration
Change-Id: I90126ff22dd394eba4145db142b3914d211af476
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-26 12:17:31 +00:00
Nikolai Kosjar
4795059703 CppTools: Avoid inserting invalid entries into cache
...of resolved files.

This is an issue when first a misconfigured project (missing include
paths) is indexed. E.g. then <QtTest> resolves to "", which is inserted
into the cache. Resolving the same header for subsequent projects has
returned the empty string although their header paths were correct.

This led to wrong includes of documents from the global snapshot.

Task-number: QTCREATORBUG-15736
Change-Id: Ia3e3a06775a50dd75bc62a46d674c7b46a1c5965
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2016-02-26 12:00:36 +00:00
Alessandro Portale
d36716ae14 Themes: Fix UI recoloring for flat themes
Reduce the usage of half-transparent colors to just the Fancy* widgets.
Otherwise, we have side effects like QTCREATORBUG-15770 in other
widgets (e.g. search results pane).

Change-Id: I0e2b0155441c4f1a071bd3c1029577accb73d56b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-26 11:54:13 +00:00
Christian Stenger
c9f595bfc7 AutoTest: Fix variable name
This variable had been forgotten during the refactoring.

Change-Id: Icafe84ea04dec5822d2879db87f3b7334020924e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 10:08:45 +00:00
Eike Ziller
34fd32565a Merge remote-tracking branch 'origin/master' into 4.0
Change-Id: I07981129945f5a78f3ec4a4740a983c613b41e48
2016-02-26 10:58:01 +01:00
Christian Stenger
19c8c9bc4b AutoTest: Avoid passing around pointer without owner...
...when using signals and slots between threads.

Change-Id: Ib1ce607e225cb8d9973393c5bdaeebaa6e30bb41
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-26 09:55:48 +00:00
Christian Stenger
ba61f2946d AutoTest: Add some gtest related settings
This patch enables execution of disabled tests, repetition of
test runs and shuffling of test sets.

Change-Id: I3668afde5766d18acdf1afb7edd913655b13a76c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-02-26 09:40:46 +00:00
Christian Stenger
a4b747307e AutoTest: Fix flaky unit test
Since parsing and updating the tree model has been changed the
respective tests became flaky.

Change-Id: I82fcde51493bc86e2315018b21e9bacd8e8409a9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 09:40:39 +00:00
Christian Stenger
25d63d8556 AutoTest: Support typed gtests as well
Change-Id: I5e904ef50c76560df8b63fc766a2b78b90bf73cc
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 09:40:31 +00:00
David Schulz
8e5af55b55 AutoTest: Add convenient function to modify line and column.
Change-Id: Ica5fe4a8048b8faf75767bddb36a062ec438fcfe
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-26 09:40:24 +00:00
Christian Stenger
36f6a5580f AutoTest: Unify handling of test tree items...
...and let specialized items handle its specialization by itself.

Change-Id: I988ce3c610bef68933b9102bb39ae4723add3a99
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 09:40:16 +00:00
Christian Stenger
009eef4e0d AutoTest: Separate TestTreeItems
Change-Id: I7592365832c6a24c9edc38c6fd3e38122711f2a4
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 09:40:06 +00:00
Christian Stenger
cb9909083b AutoTest: Don't duplicate information inside TestTreeItem
For Quick Test and Google Test tree items the referencing file is
always the same as the main file, so remove this duplication and
use the referencing file as this information is mandatory.

Change-Id: Ib9ddb1d546ed785a4f1aad133a63138c929379c2
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-26 09:40:00 +00:00
Eike Ziller
47c3755600 mapReduce: Support progress information and add (unordered) map
If a container is given to mapReduce, it takes the responsibility to
report progress information for the whole operation. If the map function
reports its own progress, that is taken into account for the overall
progress.

The (so far only unordered) Utils::map operation can be used to replace
MultiTask, by passing a member function of the items in the container as
a map function.

Change-Id: I18ca38a6ad2899d73f590bfe59bf2e6eb2f1a57a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-26 08:36:08 +00:00
Eike Ziller
d2350c230e FileSearch: Fixes for making FileIterator actual ForwardIterator
Give iterators 'a' and 'b', if a == b, either both are non-dereference
or *a and *b are references bound to the same object.
Also add missing default constructor, copy constructor and copy
assignment operator.

Change-Id: I53fd30a620155b9faa9850b2ffcf546376b14cff
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-26 08:35:52 +00:00
Eike Ziller
dcf09b0008 runAsync: Support functions wrapped in reference_wrapper
Change-Id: I2dbb793239d432a1316dadb81beee564cc858eaa
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-26 08:35:40 +00:00
Marco Bubke
640d126917 Utils: Optimize Small String comparison a little bit
Change-Id: I798d4c399b1aced566e9b302463fd6491c04e8a1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-25 17:29:46 +00:00
Robert Loehning
4ec10b55e8 Squish: Update expected files for tst_openqt_creator
Change-Id: I32deb594e6836ba2dd627cdc1613bfc1fc26cd47
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-25 16:56:53 +00:00
Robert Loehning
4ad4f17811 Squish: Update expected files for tst_opencreator_qbs
Change-Id: Ia840b6fef18bf09bce9938e9b2df5916e454bd7c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-25 16:56:38 +00:00