Commit Graph

46254 Commits

Author SHA1 Message Date
David Schulz
08655de4a5 CodeAssist: Remove unrelated member from ProcessorRunner.
Change-Id: I53ca41e6d3309680d7153c0847c31b8380856848
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-03 13:38:04 +00:00
Tobias Hunger
1355001e22 Target: Clean up names to follow form used almost everywhere else
Change-Id: I65f40995ee3be56429bca1dc16e12ff8632ea398
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-03 13:32:19 +00:00
Tobias Hunger
8755a56c9f Target: Sort forward declarations
Change-Id: I76cf79a7674ad387be556daaaab48af8310d1532
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-03 13:32:12 +00:00
Tobias Hunger
fc62feba6a Project: Sort forward declarations
Change-Id: I97b1ec0d899d940f901de1929f0976eab5ce8399
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-03 13:32:07 +00:00
Takumi ASAKI
8d3e0a1017 AutoTest: tr()-Fixes
Do not use QObject::tr().

Change-Id: If92f36166f29defd3501410efeed8e6f68dc896d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-03 13:28:26 +00:00
Nikolai Kosjar
17c1325cc4 Clang: Fix dot to arrow correction
The position of the dot character was determined on an outdated
translation unit.

We queried the translation unit for the source location of the dot
character, but apparently clang_codeCompleteAt() does not update the
source locations for the translation unit. And we do not want to reparse
since this is expensive. Thus, determine the byte position manually by
scanning over the document until the right line/column is reached.

Change-Id: I25e256bb81a83bb71c7e46a0fb3e927bf4031b16
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-03 12:19:13 +00:00
Eike Ziller
a320628245 Merge "Merge remote-tracking branch 'origin/4.0'" 2016-05-03 10:25:01 +00:00
Alessandro Portale
3eab6dd7b0 Separate documenttypeicons svg and export script
Change-Id: I903d84f26d698b838fd6e9a0684eed71d560b958
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-03 09:51:45 +00:00
Alessandro Portale
2f22fc7828 Removed manual font grid fitting for icons >= 64px
Change-Id: Ic35924b5c374a29bdcc2b6e76be714a927e2c24f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-03 09:51:28 +00:00
Eike Ziller
0f94aa3f4d Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/projectwizardpage.cpp
	src/plugins/projectexplorer/xcodebuildparser.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp
	src/tools/clangbackend/ipcsource/translationunits.cpp

Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
2016-05-03 11:49:01 +02:00
Tobias Hunger
5fa52d2ff9 ProjectExplorer: Shorten code
Change-Id: I69f77f5ddce26a4b5300d7b1af1c2409399b0440
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-03 09:25:51 +00:00
Leena Miettinen
9b69b789ab Doc: Update the Autotools screenshot
Change-Id: I819bd25db55cc2e678fb1cb5abbeca480b9d4919
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-03 09:15:52 +00:00
Orgad Shaneh
cad9372ad9 Debugger: Do not append port if host not found
When choosing a kit with a bare metal device in Attach to Running Server
and *not* overriding the address, the address is not determined.

Change-Id: I431d0edee0635cda773e94737752aa9c31a1cac2
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-03 08:18:40 +00:00
Nikolai Kosjar
1cbb4cc954 QbsProjectManager: Fix SOFT ASSERT: "future.isFinished()"
...in file qbsproject.cpp, line 940.

The assert can be triggered with e.g.:
 1. Load a bigger qbs project, e.g. qtcreator.qbs.
 2. Trigger project build as soon as possible.
 3. Cancel the "Parsing C/C++" operation.
 4. Wait until the build finished and the assert occurs.

This happens because CppModelManager::updateProjectInfo() since

  commit  536ccc8a87
  CppTools: Fix incompletely indexed project

will check whether the previous indexer run was canceled or not. If it
was canceled, it will trigger a full-reindexing of the project.

Updating the compiler call data is a special case and it should never
trigger an indexing operation, so introduce a dedicated update function
for this case.

Change-Id: I456945ccf2bf697aaeada572ed87f3acb21a5eaf
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-03 08:03:24 +00:00
Nikolai Kosjar
506fc40a31 ClangStaticAnalyzer: Fix accepting "clang" executable
The user can set "clang.exe" in the options, which is fine. However, "clang"
was problematic on Windows since we failed to replace it with "clang-cl" for
the actual run for MSVC toolchains.

Change-Id: I2f96428d15c7406e90a38c797817aef34e7a9541
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-03 08:03:17 +00:00
Leena Miettinen
d303222c8a Doc: Update Help topic
- "General Settings" > "General"
- "Always Show Help in External Window" > "Always Show in
  External Window"
- "Filtered by" field label is gone (now a selection list)
- Update screenshots

Change-Id: I2eac1351c6a63a596e30ef15770ace2790b8bf28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-03 08:01:11 +00:00
Jochen Becher
3d6e5fff0c ModelEditor: Avoid crash if an illegal relation is placed on a diagram.
Change-Id: I0e62f4665c8530095d1beedc2c263d6212aa53e7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-03 07:51:24 +00:00
Orgad Shaneh
9b9215afe0 BareMetal: Store host/port in ssh params of device
That's where they're read from later when invoked from Attach to Running
Debug Server dialog.

Change-Id: I6cda6796e73ee49115af3afd1d45bc89fd8aff51
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-03 06:58:25 +00:00
Orgad Shaneh
b280c4125b Debugger: Use continue on dialog triggered remote debugging
Change-Id: I171af41f7527bd99f5d52259674d76f5b580e6bb
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-03 05:56:41 +00:00
Orgad Shaneh
9ca0e50959 Debugger: Set symbol file on dialog-started debugging
Like Attach to Running Server

Change-Id: If8b5a8ed367edb82c50eb0e4b5c07a5aaf76396e
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-03 05:22:10 +00:00
Lorenz Haas
5b3f36184b Beautifier: Modernize, code style, and clean up
Use nullptr and range based for loops, unify initializer list code
style, remove superfluous includes, make private slots private methods,
get rid of QLatin1(Char|String), use initializer lists and some minor
code style issues.

Change-Id: I94ba10fc96bb628239364a8201bde98a66b2c4c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-05-02 19:50:52 +00:00
Jochen Becher
90e107c882 Update german translation
Change-Id: I9d699da6668aafd45d7399fc4d5eb37c3ac6f223
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-02 16:47:16 +00:00
Leena Miettinen
925347ea4b Doc: Update Qbs info
- Describe Version Info tab
- Update instructions for creating Qbs projects
- Remove description of Clean all artifacts check box
- Describe Store profiles in Qt Creator settings directory
  check box
- Update screenshots

Change-Id: Ie0f237e1036c8be1a9bb5151001e8d52e38b6cec
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-02 15:12:16 +00:00
Christian Kandeler
70f99ee240 Update qbs submodule.
To HEAD of 1.5 branch.

Change-Id: I5ed6f3d0fc6d38d8fc1fffd4e442efd09d9330b9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-02 14:37:25 +00:00
Thomas Hartmann
d25b88c304 QmlDesigner: Add Move to Component to the designer
This allows the creation of components from existing code in the designer.

Change-Id: I2a0e45fca64c4ddbce6d594d40e683600b7fec32
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-02 13:02:44 +00:00
Ulf Hermann
75d8169e1e QmlProfiler: Repopulate the file finder when loading a trace
We might have opened or closed projects since the last time we
populated the finder, and we will need the files from those projects
to resolve file names in the trace.

Change-Id: I5979702a105c60e1be452b0b029d01d7498bff3d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-02 11:35:52 +00:00
hjk
6a50dbd2aa Debugger: Disable QAbstractItemModel dumper
The inferior calls to rowCount() and columnCount() used to create
the "n x m" "nice" display are troublesome when debugging an actual
issue with item models and not too helpful otherwise. People needing
that information can still evaluate m->rowCount() etc manually.

Change-Id: I3a3feed6aab19096ab01bc91c488de5fcbd732d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-02 11:29:06 +00:00
hjk
f68386411f BareMetal: Fix after b3c1da03
Change-Id: Id9c482070c0fe97283b9be0cc4dcd4e8fe3087e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-02 11:28:48 +00:00
hjk
93a4170d2e FakeVim: Squash warning on QChar::unicode() use
Adapt to deprecation warnings from Qt base.

Change-Id: Ifb1e26dce1456bb72ef663bfe74a934ed1ee4e24
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-02 11:28:39 +00:00
Thomas Hartmann
b98715a0b2 QmlDesigner: Fix crumble bar for component navigation
We have to push the complete path not just the file name.

Change-Id: I1a2f459f792c9343a9422f74781a0bc23d19956a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-02 11:10:44 +00:00
Tobias Hunger
87995d653a Fix crash in Wizard code handling adding to the current project
This is a partial backport of f007db9c4560bd6e302aa288f855a8a08d92ce474
from the master branch.

Task-number: QTCREATORBUG-16194
Change-Id: I4f0223c53d34ae701f05385023d5466f3d372c9f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-02 10:59:31 +00:00
Ulf Hermann
d92b8edf51 QmlProfiler: Keep find bar in focus when notes are found
Change-Id: Icca92cd50d7fcda510b7d9d023e4450f53cbdbfd
Task-number: QTCREATORBUG-16193
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-02 10:50:55 +00:00
Thomas Hartmann
0bae72949d QmlDesigner: Fix crumble bar for component navigation
We have to push the complete path not just the file name.
This patch does not apply do master. A similar patch is
applied to master manually.

Change-Id: I1a2f459f792c9343a9422f74781a0bc23d1995aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-02 10:06:36 +00:00
Orgad Shaneh
e231073a40 Qbs: Enable exceptions where needed
Align with qmake project

Change-Id: Ic68619a0b5e3bf6052c8b52165337063a24e2b5d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-02 09:19:05 +00:00
Thomas Hartmann
000b82523b QmlJSEditor: Do not open created component
The user can easily navigate to the new component
and in many cases the user wants to continue in the
original document.

Change-Id: Id91ed4c0adb26cf91d39be73689aec4f34034488
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-02 09:16:11 +00:00
Orgad Shaneh
00324a9af1 Qbs: Minor cleanup in debugger.qbs
Use a prefix for analyzer

Change-Id: Ic89408758eff3ca8ffd425a0337378e6086a4eb1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-02 09:15:57 +00:00
hjk
bff8c3108d Android: Make avd name extraction more robust.
The output of the console seems to have changed lately and includes
some initial help hint now. Try to ignore that by always using the
output before the last OK in the the response.

Change-Id: I1cd5bfedd1aaea9de0d494b92d965ce0c60d1655
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
2016-05-02 09:09:48 +00:00
hjk
ad1fb8d0bd TreeModel: Add override where appropriate
Change-Id: Ifdfcc1dffef91cd59332bee14cf6149c379376d4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-02 09:06:13 +00:00
Orgad Shaneh
dbdc3ab400 Git: Fix error message on run failure
The working directory appears twice.

Change-Id: I485f53420c58f677b864d7be7078c4871027831f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-02 08:53:38 +00:00
Christian Kandeler
47a19dcacb CMakeProjectManager: Fix qbs build.
Was broken in 2f301bc45b.

Change-Id: Ibd055e65443dc224a28905c57c792ffb0f86a43b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-02 08:52:05 +00:00
Alessandro Portale
20fcdd5f1f Update the Qt logo in application icons
"About Qt Creator..." icon.
Application icon for Windows.
Application icon and document icons (.pro, .pri) for OSX.

Change-Id: Ic751336a42838a63b9590bc69063491e63f552f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Diana de Sousa <diana.desousa@theqtcompany.com>
2016-05-02 08:26:56 +00:00
Thomas Hartmann
6ba8be3d8a QmlJSEditor: Export ComponentFromObjectDef
This makes it possible to use the functionality from the designer.

Change-Id: Id91ed4c0adb22ff91d39be73689aec4f340342b8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-02 07:42:02 +00:00
Thomas Hartmann
86e59fa1ab QmlJSEditor: Do not use fileName()
The method fileName() is rendundant and the
QmlJSQuickFixInterface does not have to be valid.

Change-Id: Id91ed4c1adb26cf91d33be73689aec4f34034499
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-02 07:41:12 +00:00
Christian Stenger
b2a3c4e48d Debugger: Fix expanding of watchers...
...that have not been looked up completely.

Task-number: QTCREATORBUG-16195
Change-Id: I163426ed8a7457e77584b1bb7d091f1d63954743
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-02 07:03:19 +00:00
Leena Miettinen
3e8b7409d6 Doc: Update info about Valgrind tools
The tools are now run in the Debug mode.
Update screenshots.

Change-Id: Icfcc8ccf77c3a87d3e123eb8664359160513beff
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-02 06:55:17 +00:00
hjk
4dbb6ecd84 Android/Debugger: Always extract GDB version from binary
Change-Id: I19ab6e70a273e803b9755966e15253e006df3940
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-05-02 06:29:44 +00:00
BogDan Vatra
05739d1d6b Fix compile
Change-Id: I5c8889639c61ff11c8b159c3bd1ef63246664922
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-02 06:28:02 +00:00
Orgad Shaneh
7c6a63b10b Utils: Undef _WIN32_WINNT before defining it
Some compilers have it predefined.

Change-Id: I42087dde8e18ccd0e8954d6a51c703235480c91d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-01 10:55:07 +00:00
Orgad Shaneh
bb331566bd QbsPM: Support qtcRunnable property to filter out peripheral products
... by default.

Similar to qmake qtc_runnable.

Apply in app.qbs.

Change-Id: I8d43027f683ef18fc5a2745afe9775eb14075e69
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-01 04:31:40 +00:00
Alessandro Portale
623d571bad Center the application icons, add pro/pri document type icons #4
Change-Id: I43c2d874c02d62f15f9e1bfa4faf812b660a1b0d
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-29 18:54:59 +00:00