Commit Graph

46254 Commits

Author SHA1 Message Date
Alessandro Portale
7339761c6a Bookmarks: New Bookmark icon
Using Theme::Bookmarks_TextMarkColor so that it is consistent with the
scrollbar markers.

Change-Id: I2cd6b787a61c2a5bf3a7f684c026006ca0417591
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-18 10:02:36 +00:00
hjk
b7fabb290b RemoteLinux: Relax port gathering
We might encounter the situation that protocol is given as IPv6
but the consumer of the free port information decides to open
an IPv4(only) port. As a result the next IPv6 scan will
report the port again as open (in IPv6 namespace), while the
same port in IPv4 namespace might still be blocked, and
re-use of this port fails.

Err on the safe side, and consider ports taken in either space
as blocked.

Change-Id: I2e4be40ab4df5398e26e197c12408efe905b1a2f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-04-18 09:57:33 +00:00
Alessandro Portale
a24ce30425 Debugger: Remove QML application Zoom (for now)
It does not work.

Change-Id: I8340d6b130d3d7e1e8f1531fe4cd2b6cd9319c7b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-04-18 09:13:50 +00:00
Ulf Hermann
88476a1435 QmlProfiler: Disable run controls after they are finished
Disabled runControls would still receive and send signals, confusing
the profiler state.

Also, connect lambdas with receiver argument where possible.

Change-Id: I0cd43456d3462efe402e9d68792b67314e9b6e0b
Task-number: QTCREATORBUG-16073
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-04-18 08:07:04 +00:00
Christian Stenger
20110d1e36 AutoTest: Fix possible crash when using SymbolFinder
Task-number: QTCREATORBUG-16062
Change-Id: If8e6d2d30c1e036b38c3b030296ae051fd046759
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-04-18 07:49:17 +00:00
Christian Stenger
02a0c6f486 AutoTest: Ignore nullptr documents
It could happen that Qml related docs have not been added to the
QmlJSModelManager when trying to use them on our side.
Just ignore them when this happens as they will be added manually
as they will get added automatically when parsing the respective
main cpp file.

Change-Id: I25c4b6d9159ad4ff8def3148c2a04356380fbd27
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-18 07:47:12 +00:00
Leena Miettinen
a2170bd690 Doc: Explain Model Editor > Export Diagram command
Update screenshots.

Change-Id: I794c424837e22392541138142410fc7a07c68af1
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-04-18 07:28:19 +00:00
Leena Miettinen
2b0e6dd7bb Doc: Update screenshots related to finding
Change-Id: I647858522af44d5f2bc22ffd735dedb4df07a73c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-18 07:27:53 +00:00
Orgad Shaneh
3d85b826f0 Project: Remove obsolete commented out updateinfo
This plugin is now built by default.

Change-Id: Ib85dd7e12bca2e72bc456ef8db1bbb0eaba2401d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-18 07:01:50 +00:00
David Schulz
9ac313d8cf QmlEditor: Prevent to collect next char twice in completer.
Change-Id: Ibcd7ff84212da3f9ae65b37eadc73eed82f1e32b
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-18 05:31:30 +00:00
Orgad Shaneh
b915acbabe Qbs: Enable UpdateInfo
It was refactored in 13fcf5ad3c.

Change-Id: I05d35795618d82024a2f587fc299c9f5829080dd
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-04-17 20:52:49 +00:00
Alessandro Portale
fa5e9e9094 ProParser: Remove unused files
These files are relicts from the old pro editor.

Change-Id: I803d0491357ba73453b0a98f53bf6472be47364e
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-15 22:01:54 +00:00
Sergey Belyashov
6116b111e5 Update Russian translation
Change-Id: I39ccb765e37e2d9ff2d080ff7cf92518f6a203c9
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-04-15 15:17:05 +00:00
Alessandro Portale
ffe0d98e5b Themes: Fix loading of the default theme
This patially reverts commit 25603f9dc8.

Ouch. That change had so much mess per line. Sorry everyone.

Change-Id: I9e02965c6a12670766fa36eab5dc6ad45131955d
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-15 15:13:38 +00:00
Nikolai Kosjar
70e3665c86 Clang: Forward clangbackend output to qDebug instead of stdout/stderr
Now the output of the clangbackend can be viewed with DebugView on Windows.

Downside is that qDebug() will append newlines. This can't be turned off
easily. We accept that.

Change-Id: I7d68bfcf05780c8bcb4a05a538d2d1542a6a6f22
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-15 14:55:36 +00:00
Nikolai Kosjar
441d8d29a5 TextEditor: Emit markTooltipRequested only once per line
...otherwise the same tooltip will be created over and over again,
leading to a "moving tooltip widget".

Change-Id: I1704bc34c458ebe1aec664d5295418ab1d2b5082
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-15 14:55:20 +00:00
hjk
2e38eec002 Debugger: Compile fix
stringSettings() macro-expands internally nowadays.

Change-Id: Id702ee852b7c25b8ff7dbca0c6ada529a53a9443
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-15 14:47:34 +00:00
Christian Kandeler
cfbb84a5f8 Update qbs submodule.
To HEAD of 1.5 branch.

Change-Id: Iefa333d9bc2a0808d0f4e42605252936908ea3d3
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-04-15 14:43:57 +00:00
Ulf Hermann
f0b7a73f33 QmlProfiler: Properly clear any pending connections before reconnecting
Otherwise we might end up waiting forever for a previous session's
connection.

Change-Id: I695d7a1ce21bc9720cc84436a7c4e6ba4616b0ab
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-04-15 14:39:12 +00:00
hjk
12788ffb2d Debugger: Avoid looking up references too often
Multiple copies of lookup requests may accumulate when stepping
too quickly, outsmarting the 'all updates done' logic, keeping
Locals&Expressions in the grey 'update ongoing' state.

Change-Id: Icec24ce1af8d273c3439ee91800ed1f4381ee19a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
(cherry picked from commit c1de315d6c)
2016-04-15 14:24:35 +00:00
Alessandro Portale
25603f9dc8 Themes: New display names "Default" -> "Classic", "Default Flat" -> "Flat"
Also the defaultflat.creatortheme is renamed to flat.creatortheme.

The file name of the "Classic" theme remains default.creatortheme in
order to make sure that who previously actively switched to another theme
and back to default won't suddenly get the flat one.

Change-Id: I1a1f35aded00201a685ad221b70a9b728f2be972
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-15 14:11:13 +00:00
Tobias Hunger
2f11372dce ProjectExplorer: Modernize some more
Change-Id: I54bcda3dcf5f561f3936450c0621f6a06ac0b36a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-15 13:57:19 +00:00
Tobias Hunger
94f20cc55d ProjectExplorer: Modernize code
Change-Id: Ia967f698baba9bf84e6ef3c2ce26cafb17279f3e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-15 13:57:13 +00:00
Leena Miettinen
c94deb07bd Doc: Fix field name in QNX deployment topic
Files to install for subproject > Files to deploy

Change-Id: Iefba158ee0237ba638aceb5f73a7d61b038d59e3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-04-15 13:47:06 +00:00
Ulf Hermann
6e1b06659e ProjectExplorer: Initialize m_cascadeSetActive
Change-Id: I94ae32c7b9cd0774205ac91b09fef5beed80f540
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-04-15 13:46:33 +00:00
Robert Loehning
9e63807134 Squish: Remove workaround for fixed bug
This reverts commit ca66ad3d0c.

Task-number: QTCREATORBUG-15806
Change-Id: I2e81aa5c0fe014be6dda32b326ab3d4a1bfd9600
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-15 13:19:59 +00:00
Christian Stenger
532cd88dd7 Squish: MSVC2015 and Build Tools are supported...
...so, expect them if they are present.

Change-Id: I333bba81717d44431857a543540e5599e2de7fed
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2016-04-15 12:08:58 +00:00
Nikolai Kosjar
9cc50a96e4 Clang: Fix updating warning config widgets on remove
Problematic use case was:
 1. Go to projects mode, select "Clang Code Model"
 2. Click "Copy...", click "OK" and add e.g. " -Wbla"
 3. Click "Remove"
 ==> The configuration is reset (combobox), but the warning options are
     not (" -Wbla" is still there).

Change-Id: Ifc445a3fa0e3b3191915cf7bca220f4bef848069
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-15 12:02:28 +00:00
David Schulz
f18d32ee14 CdbExt: Remove unneeded add symbol for shared pointer.
Change-Id: I88da67b3c330e04befcdd0bc9074d28f400f199c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-15 11:41:56 +00:00
Tim Jenssen
84d7852c06 QmlDesigner: improve code niceness
Change-Id: I05ba3c6741977270c9abf9137db447c74dce025f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-15 11:38:49 +00:00
Tobias Hunger
35edbf8977 ProjectExplorer: Simplify TaskHub a bit
Change-Id: I32b47382d4abbce70607040768c3a7a167065d1b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-15 11:36:31 +00:00
Tobias Hunger
3bc96dad90 ProjectExplorer: Rename Task::addMark to setMark and make it private
Make TaskHub a friend of Task so that it can still use the method. This
should stop anyone from accidentally calling that.

Change-Id: I36974d0ba874f0cac59b7c57ed667ce2e75e1d4c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-04-15 11:36:27 +00:00
hjk
4ba5dfccf5 Debugger: Make LLDB startup user-configurable
... by reusing GDB startup command settings

Task-number: QTCREATORBUG-15584
Change-Id: I24a04ac8608f0c37374ff9c1d93d509a811d8942
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-15 11:19:23 +00:00
hjk
c0fabbe169 Debugger: Add breakpoint commands for LLDB backend
Commands needs to be given in Python, i.e. something like

    import time
    print time.asctime()
    for i in range(1, 10):
         print(i)

works.

Task-number: QTCREATORBUG-15585
Change-Id: I7724617e4bbe85a717ae78b21014e2b55c4089c8
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-15 10:50:45 +00:00
Alessandro Portale
62fc258ac0 ImageViewer: Update toolbar items for split/duplicated editors
The "export" button in a split/duplicated view was enabled for other
image formats than svg. The image size label was empty.

Fixes for all views (not just the split ones): The play button is now
disabled instead of "empty" for non-movies. The size of svgs is
displayed.

Change-Id: I1f6a2c47f3aa06ed052ba78e5e2d1edd51a0ec69
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-15 10:11:58 +00:00
Alessandro Portale
2b05793083 Help: Improved bookmark icon for non-toolbar
This change makes the bookmark icons in the bookmark list and locator
look better.

Change-Id: I9d8fab31ca945ad7d93deb82942ac0f3f972e993
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-15 10:01:21 +00:00
Leena Miettinen
593e21e2d3 Doc: Update Qt Quick Designer screenshots
Change-Id: I8238815ecef360a8f7076e26d58dd8b8bdb3d563
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-15 09:54:16 +00:00
Tobias Hunger
95ac4edfd4 Projectexplorer: Modernize codebase
Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
2016-04-15 09:40:53 +00:00
Alessandro Portale
bb2374d405 Locator: Improved locator command help icon
Using the "warning" yellow which works better against non-toolbar
background. Also without the shadow.

Change-Id: I30e537cbb4bd6de0377af32ec98412c153a55327
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-04-15 09:16:19 +00:00
Eike Ziller
79da8a4586 iOS: Fix message about failed deployment
The device settings were moved from the Organizer window to its own
Devices window quite a while ago.

Change-Id: Ia3cdc7686ef70bde0e6c443dc2d72b64f54fdbf3
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-04-15 08:50:01 +00:00
Nikolai Kosjar
f169f51e96 C++: Fix compile warning
...with clang:

cplusplus-keywordgen.cpp:74:1: warning:
  'State' defined as a struct here but previously declared as a class
  [-Wmismatched-tags]

Change-Id: Ibf95439e060a5bb32f0aae7d3f3a34c8821165bd
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-15 08:47:34 +00:00
hjk
9a4700aae6 Git: some cleanup in gitclient.{h,cpp}
Unneeded declarations, s/static const/const/, #include order, ...

Change-Id: Ie7970f1a0ec1989d79bac56e9bad87852dd036ea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-15 08:35:40 +00:00
Eike Ziller
8a77eacf8d Merge remote-tracking branch 'origin/4.0'
Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
2016-04-15 10:07:55 +02:00
hjk
7080645d20 Debugger: Clean pending lookup requests when preparing a step
This avoids accumulating lookup requests when stepping quickly.
They won't produce usable output anymore.

Change-Id: I9e29ca1778019e3eab37d122386d3faf0e07edbf
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-15 06:45:05 +00:00
Christian Stenger
0a9e40dc9d Valgrind: Avoid soft assert on missing line numbers
If callgrind does not find a valid line number information trying
to paint the respective text mark runs into a soft assert.
Avoid this by not creating a text mark for such results.

Change-Id: Ib1c49db82fd4d46bf84ecdc398b88fb0ca09707d
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-15 04:56:52 +00:00
Lorenz Haas
0338f6909c Beautifier: Use Uncrustify's new --assume option
Instead of treating all files as C++ with version 0.62 we can use
Uncrustify's new option --assume. It decides which language the file is.
Thus using Uncrustify inside the Beautifier behaves like calling it on
the command line.

Task-number: QTCREATORBUG-15575
Change-Id: I8cd2250194b4acb81a9062f99c5ce5ea6083bd5a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-14 20:10:12 +00:00
Lorenz Haas
3310fbc8f2 Beautifier: Fix clang-format's custom style handling
Instead of dealing with clang-format's YAML format use proper command
line parameters.

Task-number: QTCREATORBUG-15604
Change-Id: Ie0b22aff105c8d208d30e2e945b0036b0b8606c1
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-14 20:07:05 +00:00
Christian Stenger
e63f503592 AutoTest: Handle canceling file dialog properly
Task-number: QTCREATORBUG-16071
Change-Id: Iacb16003f9f34cfa0c0cd14a51320de800f8024b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-04-14 15:18:10 +00:00
hjk
d2f8213728 Debugger: Fix reporting of special dumper formats for LLDB
E.g. for QImage etc.

Change-Id: I78201f55448a151d40d0d7fb10440a6cb87efd03
Task-number: QTCREATORBUG-10402
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-14 14:40:46 +00:00
Christian Stenger
b7a8abec13 AutoTest: Separate code parsing and begin to unify
This is preparation for a consistent interface to be later
able to provide a way to support other frameworks more easily.

Change-Id: I6d83060364121eb3d11f7e0b5b259b6eeb1564b4
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-14 14:33:24 +00:00