Commit Graph

44854 Commits

Author SHA1 Message Date
Christian Kandeler
9a0062a942 TextEditor: Fix qbs build.
Change-Id: Ib4f62c72bd469eeec084e79a3390e92aeb351b22
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-18 16:10:19 +00:00
Marc Reilly
403f0a612c CppEditor: Install color preview hover handler for editor
Change-Id: I9c7c2f085638a9b267ed2fc2df93267d5e9501ea
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-18 13:19:41 +00:00
Christian Stenger
eca35ce868 Make disabled a state instead of separate type
State will be enhanced later on to provide better support for gtest.

Change-Id: I3f3f6b986d6a25ebd36fe44330c792608844b35c
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-18 13:02:59 +00:00
Christian Kandeler
b72c3cba24 SSH: Use categorized logging.
Change-Id: I9890c7d4a86320c835e70e66c523c5a2f7b41421
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-18 12:17:15 +00:00
Tobias Hunger
54d64971d8 Update License according to aggrement with Free Qt Foundation
* Update license of files loaded in debugger
* Make sure all files have a license header

Change-Id: I612885652bcae0a4b7a88ae5184ef661aee25006
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-18 10:41:20 +00:00
Caspar Schutijser
4da6cfdf2a Abi: add OpenBSD
Change-Id: I77ec7e06c38a54e753b9b39aebc7d2caaa3c8fc0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-18 10:40:13 +00:00
Marc Reilly
d2bb44479e texteditor: add a hover handler which shows color preview tooltips
This adds a new hover handler which matches stand-alone color strings
like "#112233" or "Qt::yellow" or function argument tuples for colors
such as "QColor(0x11, 0x22, 0x33)". When matching against function
arguments, the function name must correspond to a recognized color
function (setRgb, etc. This is biased towards cpp text, but not limited
to such). The matching occurs when hovering over the arguments, not the
function.
If a match is identified, the hover handler gives it a relatively high
ranking.

Change-Id: Ied2927399cb19d6f562185a8b087f0ce118157db
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-18 09:25:15 +00:00
Marc Reilly
64b172ae73 hoverhandler: add priority system to determine which tooltip is shown
Hover handlers now have a priority which is used to determine which
handler's tooltip is shown. The handler with the highest priority is
used, or, in the case of equal rankings, the first registered handler.

The base handler implements a default basic priority system based on the
diagnostic and help properties. Derived handlers can manually set the
ranking value as part of the identifyMatch() call.

A new checkToolTip() method is added so the handler can analyze whether a
tooltip is valid without it being shown.

Change-Id: I9d82fb9cc52f1d3cd53a8b197d75cd923651b79d
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-18 09:25:03 +00:00
Tobias Hunger
8c6b31f3d8 Update License according to aggrement with Free Qt Foundation
* Update IFW files

Change-Id: I8d715816df3ba420f1ba72ea997979303228a779
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-18 09:05:24 +00:00
Ulf Hermann
32bbd6c8b9 Remove setContents() from imageviewer
It doesn't actually do anything.

Change-Id: Ic89b778427c4dd663f7577f522688cde99da06f9
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-18 08:57:03 +00:00
Orgad Shaneh
5be49c5187 C++: Match const/volatile/signed/unsigned for FullySpecifiedType
Changing a function signature from const to non-const is not recognized as a
changed, and doesn't trigger the "Apply Function Signature Changes" quickfix.

For example:
void func(Foo &var);
void func(Foo &var) {} // Add const before Foo, quickfix is not triggered

Change-Id: I71ae41765d66df69204abd085fdfcfcb2d605f4c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-15 14:05:22 +00:00
Tobias Hunger
07dd7d5fe2 Update License according to aggrement with Free Qt Foundation
* Update license files in various places
* Update the license template
* Update README.md and appdata.xml

Change-Id: I0ae9365b15364728165e79ba8ad86dfdd6cb9ddd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-15 14:04:27 +00:00
Christian Stenger
00f93b95a7 Make parameterized gtests visually distinguishable
Change-Id: I08642a5988b43b3bbbb7209564561860219f4d1a
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-15 13:15:44 +00:00
Christian Stenger
9055ac5f50 Provide parameterized gtest for plugin unit tests
Change-Id: I17a42a9070546a5b461fcb27643bd6db7b5d7b4f
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-15 13:13:39 +00:00
Christian Stenger
02281ad429 Provide plugin unit test for gtest code parsing
This test needs environment variable GOOGLETEST_DIR to point to
an existing checkout of the googletest repository, or it will
be skipped.

Change-Id: I1e0ba250da84143b50f70589113ab6d6ea3a5b73
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-15 10:14:46 +00:00
Christian Stenger
1abd193bb2 Fix operator<() for GTestCaseSpec
Introduced broken with cbdf48a792.

Change-Id: Ib224fd167573594673f5370c5330280809017904
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-15 08:21:17 +00:00
Eike Ziller
9493d4764b mapReduce/runAsync: Fix behavior of waitForFinished
When a QFutureInterface is constructed, it is in "NoState",
but waitForFinished only blocks if it is in "Running" state.
So we need to reportStarted actually before the thread is started
(so we report it before leaving the mapReduce/runAsync method)

Change-Id: I1cdf0d627c5a6c26797b04fd0d331cddb01d50af
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-15 07:46:01 +00:00
Orgad Shaneh
67153b225f Core: Fix compilation
Change-Id: Icae9a1db31e887c751b3a0c71cfd93b4fa6ead98
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-14 15:48:09 +00:00
Orgad Shaneh
111a230659 Theme: Remove unused ThemeSettings
Change-Id: I5f3ee8f5afa2ef8618d9a43a10e37a30f771d0af
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-14 15:00:01 +00:00
Orgad Shaneh
64c552f555 Theme: Inline UI
Change-Id: I1d8403484583bb6ff4186ac65730e26724fedad9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-01-14 14:59:57 +00:00
Friedemann Kleint
9c77515b21 Debugger: Improve UnstartedAppWatcherDialog.
Make it possible to ESC out of it by using a QDialogButtonBox
and overriding the ESC shortcut. Also remove context help button.

Change-Id: If632c5f3cadc012dd2f67dcb709570f7a9c25bf5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-14 14:45:20 +00:00
Eike Ziller
cfc89a685e IDocument: Rename defaultPath and suggestedFileName
To fallbackSaveAsPath and fallbackSaveAsFileName. That makes it clearer
what they are for, and that they actually belong to each other.

Change-Id: Ie5b83b9db77d39a7fe9e979cc8f22b7f5b9101a3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-14 14:40:45 +00:00
Eike Ziller
66088a799a EditorManager: Remove unnecessary use of defaultPath() in saveDocumentAs
Do not unnecessarily construct a path with document->defaultPath(). We
can just ask for the mime type(s) for the suggestedFileName without a
path.

Change-Id: I1354756bd7760561a2bd9d39f491c5e1b6aeb3ab
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-14 14:40:34 +00:00
Christian Stenger
cbdf48a792 Distinguish between parameterized and unparameterized google tests
This additionally fixes an issue when trying to execute a
parameterized google test by invoking 'Run This Test'
or using 'Run Selected Tests'.

Change-Id: I199effcf76b34efd1a041c9a38b5bf90cdc002f8
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-14 13:50:02 +00:00
Christian Kandeler
78b45e41af Fix qbs build.
Change-Id: I9774978d3531dea118a8bb27d17c23cb8e906c5a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-01-14 13:10:07 +00:00
Eike Ziller
27425b62e9 Locator: Avoid use of QtConcurrent
QtConcurrent limits resource usage to a global number of simultaneous
threads. That means that if some QtConcurrent based algorithm currently
grabs all threads, any other use of QtConcurrent blocks, which is not
what we want.
Use the new threading methods of C++11 instead, but still use
QFuture(Interface) manually for status reporting.

Task-number: QTCREATORBUG-14640
Change-Id: I8fecb43b5235da92c0d239e7dd5f2c108ab32ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-14 10:49:51 +00:00
Ulf Hermann
4292fb7ef6 Change license terms to commercial or GPL.
Change-Id: I928769fa86f1ac5c489918bf2da3c691054a0459
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-14 10:46:34 +00:00
Alessandro Portale
3c8715f001 QtSupport: Compile fix
Feature set API cahnged

Change-Id: I3efb4d0eac54d5ba357e1d182598e16cd75eda48
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-14 09:07:20 +00:00
Nikolai Kosjar
b7bc044b00 Clang: Require llvm/libclang 3.6.2 as minimum version
...since we had crash issues on OS X with 3.6.0/3.6.1.

Released packages are already shipped with 3.6.2.

Change-Id: I364288d5c7dc32beacbbdbc231c2be4e6a6818bf
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-01-14 09:00:33 +00:00
Alessandro Portale
cacd014dc2 Theme: Force new start of Creator when changing the theme
Let's face it. "Live" theme change doesn't work reliably and
there is currently no effort to make this work. This change
removes the theme change during a Qt Creator run and shows "Restart
required" message dialog which we know from the language settings.

Change-Id: Ic9d300c5378841905260ff725aa3011717191de7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-14 08:40:40 +00:00
Alessandro Portale
9573ead443 Removing the ThemeEditor
The Theme editor is a feature which was present but disabled since the
introduction of Themes. It is still unfinished and unlikely to be
finished.

An alternative, cheaper approch could be installing a file watcher
on a theme file, and reloading it on any change. But for that we
would still need proper theme switching during runtime.

Change-Id: Ifd44e8c25c924a8f021618d20ce126648a3558a3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-01-14 08:40:02 +00:00
Eike Ziller
4255493881 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ia5e169a276e21db59b4b26a1ed3f253bff9e2ab9
2016-01-14 09:32:17 +01:00
David Schulz
ae3b9042c9 Editor: Use internal zoom functions.
Task-number: QTCREATORBUG-15609
Task-number: QTCREATORBUG-15608
Change-Id: I133ddbbb55cd5b876daed9e33c7a93b07e2d2e38
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-14 07:58:11 +00:00
Robert Loehning
8fc7dac761 QMLDesigner: Fix tooltip for "Preferred size" label.
Change-Id: Ib768b349969578f906c25bc809537dfd4cff0a3b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-13 16:52:43 +00:00
Marco Bubke
2b414536a0 Fix compile break
Add cpptools/projectinfo.h

Change-Id: I270005c56dd1a02941e5d728c712b29830507acb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-13 14:48:05 +00:00
Marco Bubke
5fa9e42725 Adapt to removal of cpptools/cppprojects.h
Change-Id: I914700271f28f3fdef9c7f30ed7cb2fc65d4d39e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-13 14:47:57 +00:00
Marco Bubke
ddd1d4c9cc CppTools: Remove cpptools/cppprojects.[h|cpp]
Change-Id: Ida0e8552d371972c141cf561b28667f4428c6fff
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-13 14:47:27 +00:00
Marco Bubke
68bd9a881f CppTools: Moving CompilerOptionsBuilder in its own header file
Change-Id: I503ffd72a98db6668f6449ce95e695e035a79a29
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-13 14:47:20 +00:00
Marco Bubke
1ae509541c CppTools: Moving ProjectPartBuilder in its own header
Change-Id: I0aa65ec6c80dcd437f13ff70021388b0da57ccfd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-13 14:47:11 +00:00
Marco Bubke
da1f8e66e5 CppTools: Move ProjectInfo in its own header file
Change-Id: I0fc4c73553a29585d4ff7c8d6593acb6975d1607
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-13 14:47:04 +00:00
Marco Bubke
2b4cadf1fe CppTools: Move ProjectPart in its own header file
Also extracting inline HeaderPath class and change projects list in vector
because the size is  larger than a pointer.

Change-Id: I885fdff3fe9bccc877634d1615249755f5b674fd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-13 14:46:56 +00:00
Ulf Hermann
42d570a3fe Rename Project::ExcludeGeneratedFiles
We want to distinguish between source files and generated files. So
let's call them by their names.

Change-Id: I324c4b82ca7fb7d8d0e175ea6c4f14f1306ec929
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-13 14:12:08 +00:00
Christian Stenger
0502bb3cf7 Move functions to utils class
Change-Id: I8fd3d32b22976a11fd5bc5e3282e2cde0c409349
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-13 13:55:14 +00:00
Christian Stenger
54d753574e Move TestType enum into constants...
...to avoid defining the enum in several places although almost
having the same meaning.
Additionally rename the values to ensure not to run in a name
clash at some point.

Change-Id: I0f23041b785c87efd3e7feebef855042595473f6
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-13 13:51:33 +00:00
Christian Stenger
97011c6951 Rename setProfile to setProFile
Function sets the path to a *.pro file not a profile.

Change-Id: Ied804df48086695773e25b63a4bd17c76919b01d
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-13 13:51:23 +00:00
Eike Ziller
0e012a835b File search: Avoid use of QtConcurrent
QtConcurrent limits resource usage to a global number of simultaneous
threads. That means that if some QtConcurrent based algorithm currently
grabs all threads, any other use of QtConcurrent blocks, which is not
what we want.
Use the new threading methods of C++11 instead, but still use
QFuture(Interface) manually for the progress, result and status
reporting.

Task-number: QTCREATORBUG-14640
Change-Id: I6379d2f2a01b6d200811ef4be0bbfcd4493dd154
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-13 13:00:52 +00:00
Christian Stenger
07ba6bc7e3 Redo processing output to avoid costly functions
Change-Id: I8fa0a84f49b981909d5ac61ef7993c3569aafa2b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-13 10:12:08 +00:00
Christian Stenger
059f8cf3e9 Remove unused variables
Change-Id: I54702e7a604c7d450a6664812fb302b9e55f9a47
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-13 10:11:44 +00:00
Christian Stenger
ce926564b0 Handle disabled gtests more correctly
Test summary now displays the number of disabled tests instead of having
them printed as loose messages.

Change-Id: I8ea736f789afc7c8ad6101a03fa5ca6428d92744
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-13 10:11:04 +00:00
Christian Stenger
c8c79c409f Make test result distinguishable more easily
This additionally fixes the output of the gtest related test cases.

Change-Id: Ia9e19604ffe387752b08db4a4ad9a9e255d210a3
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-13 10:10:52 +00:00