Commit Graph

45323 Commits

Author SHA1 Message Date
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
hjk
4babde7d85 Debugger: Merge DEBUGGER_EXPORT and ANALYZERBASE_EXPORT
Change-Id: Ia6af3e8aa11d7661e9d48adc4e7821badbb2db56
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2016-02-25 14:39:31 +00:00
hjk
c15a2afc49 Debugger: Some less verbose member initialization
Change-Id: I9e565d758ac490cc9ccb984e4d4e1ca809fb5a09
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-25 14:29:08 +00:00
Nikolai Kosjar
b2397b6b4f Clang: Ignore certain warnings in header files
We already had this workarounded, but it got lost in the refactorings.

Task-number: QTCREATORBUG-12067
Change-Id: Ie01f9d41f25d17d1b595204748634bc87ef44378
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-02-25 13:31:15 +00:00
Jesus Fernandez
817f12fddd Changed Close button to text to &Close
The close button in reload prompt message box had no keyboard shortcut.
The text was changed to &Close to add the shortcut. This behavior is
useful after a long QtCreator session and several Qt intermediate files
open. When those files are regenerated it's useful to close them.

Change-Id: I25a9134eeed3ce6f10a5b698c7eda9f714f3bae5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-25 13:23:20 +00:00
Eike Ziller
5750b735b9 EditorManager: Rename "restored" to "suspended" documents
For documents that were "restored" from a session, without actually
opening them.
The new naming differentiates them from documents that were "restored"
from auto-save files, and also fits better if we later "suspend"
documents that have not been visible for a while.

Change-Id: I7727344299eb2b395fc94cd1ab401ceb489111aa
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-25 13:22:40 +00:00
Christian Stenger
ed7fee4ccb Tests: Fix compile
Introduced with aaf05f5acd.

Change-Id: I74707cf0af0dd8058536acdee19750583193ed8b
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-02-25 12:42:23 +00:00
hjk
aaf05f5acd Move analyzerbase to debugger
This is the first mechanical step to execute on the 'shared pool of
debugger/analyzer views' idea.

Future steps would be providing infrastructure for the view pool,
making all analyzer/debugger views use the pool and then re-extract
a sensible base for a 'analyzer-and/or-debugger' tool plugin interface.

Change-Id: I1bb392e6dd3084fc56937956bee1d6fd9530335d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-25 12:31:06 +00:00
Tobias Hunger
b4a2a20da7 Utils: Add a way to trigger the HeaderViewStretcher
Change-Id: I4fd3179015ba325d8e739357d393aff6ce23072f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-25 12:05:58 +00:00
Eike Ziller
29fadd610b Merge remote-tracking branch 'origin/4.0'
Change-Id: Ieead754209dd535687870469a49c2371ecfa00de
2016-02-25 12:01:02 +01:00
Eike Ziller
40e7e2cc6e Merge remote-tracking branch 'origin/master' into 4.0
Change-Id: If8d27122d8015700da6684538d01958e9dd2da80
2016-02-25 11:58:44 +01:00
Eike Ziller
08457143f8 runAsync: Fix build issue with MSVC2015
MSVC2015 has a bug that reference_wrappers have a call operator even if
the wrapped object isn't callable.

Change-Id: I02d96712418f55470034098caab5a61f687194ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2016-02-25 10:51:25 +00:00
Robert Loehning
edadd6cad5 Squish: Remove unused object
Change-Id: I65021379b27803ea1d38f554348b24e210fb0c8b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-25 10:31:28 +00:00
Marco Bubke
c3a1355c34 UnitTests: Search for the google test in sibling directories too
Change-Id: I7f9c82e7f4a38a422b1df272f874c3525dfacd32
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-25 09:40:30 +00:00
Marco Bubke
fc4af46bca Utils: Remove operator[]
Because the operator is always accessing data which has a branch is can be
much slower than iterators. SmallString is optimized for performance so
it would be quite misleading to have a non performing access operator.

Change-Id: Id882c3c12508afa393ce0766bbb680690a193c95
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-25 09:40:05 +00:00
Marco Bubke
6315bd5de2 Utils: Rename hasAllocated in isReference
HasAllocated it misleading because it means that it has read only
references too. Maybe isPointing would be good too but so it is more
orthogonal to isReadOnlyReference.

Change-Id: I79aaa271aa302de2500c2ea81614e433d76f74ec
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-25 09:39:57 +00:00