Commit Graph

44854 Commits

Author SHA1 Message Date
Tobias Hunger
8d936b8aa6 AndroidDeployQtStep: Keep data requested from user around
Reuse the data for the following AndroidDeployQtSteps that
are in the same batch submitted to the BuildManager.

This should fix Qt Creator asking for the device multiple times
when building projects that depend on other projects.

Task-number: QTCREATORBUG-15338
Change-Id: I4fbb04d4d8e492f6a766461bca3e6f9683824def
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-17 12:11:42 +00:00
BogDan Vatra
9db8adec7d Export explicitly instantiate templates.
LLVM & MSVC needs to explicitly export the instantiate templates.

Change-Id: I51562750415400bfa561fd6e759211f2b4b10650
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-17 11:35:44 +00:00
Ulf Hermann
7d87b9cd97 Timeline: Pass the right dragOffset to CategoryLabels
Also, make sure the category dragger only reacts to vertical mouse
movements.

Change-Id: Ic53db9030536a1f2d35ea02facb920a4d3f0a005
Task-number: QTCREATORBUG-15333
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 10:07:00 +00:00
Tobias Hunger
f996f05b0f AndroidDeployQtStep: Pack data
Change-Id: I044dd8a71ad2a3502ce3c96dcbce3c850a13e819
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-17 10:05:20 +00:00
Tobias Hunger
8e55ee6377 Android: Clean up AndroidDeviceInfo
Turn it into a class, add a isValid method and initialize it properly

Change-Id: I413ca931b125c9bbfc58b855280e9e58402f3d0b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-17 10:05:06 +00:00
Tobias Hunger
d2bb143552 TargetSettingsPanel: Small cleanup
Change-Id: I39b75d3af36c5770c995f2923ac2e7e49b042850
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-17 10:04:37 +00:00
Tobias Hunger
3be770eeae Target: Use Qt5-style connects
Make the slots private now, remove protected as nothing inherits
from Target.

Change-Id: I4aaa4402ef6ee83a27dd6233f188a507e9de8169
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-17 10:04:23 +00:00
Tobias Hunger
3bb3ece568 Abi: Fix warning about conversion from int to unsigned char
Change-Id: I49ce840823d4a60a1d97a7313551b00e39929619
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-17 10:04:11 +00:00
Eike Ziller
1dc8d0f032 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ibee24c1c80984cdc45e7bcf3e4fbb5f1e6b81454
2015-11-17 09:38:05 +01:00
Eike Ziller
bc4de63b61 Merge remote-tracking branch 'origin/3.6'
Change-Id: I9b99eddcf54720f494449514ddaaa11544098c0d
2015-11-17 09:37:16 +01:00
Eike Ziller
6b1f863363 Revert "Revert "Properly clear input events model""
The revert was only for 3.6 branch.
This reverts commit eec2b2d0ee.

Change-Id: Id338a078ff5265d5517b935a1056a8e1c7d652c7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-17 08:33:47 +00:00
Eike Ziller
cbaff220e7 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ic042c3dee945b1a0104c492e21ba34842cdea3fa
2015-11-17 09:32:33 +01:00
Ulf Hermann
eec2b2d0ee Revert "Properly clear input events model"
This reverts commit d1d694efb5.

It should have gone to the master branch.

Change-Id: I1c5b86caf5092e1d5d1ac9866e2887a912b1c65e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
qp-v3.6.0 qp-v3.6.0-rc1
2015-11-17 08:29:47 +00:00
Eike Ziller
2c43009033 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ia0f2227bf86fb9d52ab2ec4f687554e0540a0117
2015-11-17 09:29:24 +01:00
Ulf Hermann
53957ee2ae Translate strings in input events model
Change-Id: Ia549295adafa42b9236f568c04e52b48e8943337
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:50:57 +00:00
Ulf Hermann
4ff20dfa8c QmlProfiler: Move location lookup into base model
We will need it in a second derived model.

Change-Id: I5d2459c490034b592f643f248bf5be2e44af44aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:50:32 +00:00
Ulf Hermann
185412cee7 QmlProfiler: Remove QtQuick1-specific hack
Change-Id: I541fde69fcd337b5cf637b25dc0b610a956e65b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:50:27 +00:00
Ulf Hermann
58a9b0c760 QmlDebug: Allow retrieval of connection from debug client
Change-Id: Ifae983771dd0fcf1c12fb7d3e9fa496de6d24373
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:50:24 +00:00
Ulf Hermann
87b2d5cdfe QmlDebug: Add category and timestamp to debug message client
Change-Id: Id81c443251b237b56e515ede8dc579427e13d782
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:50:20 +00:00
Ulf Hermann
1b8c1af2c6 QmlProfiler: Only emit gotoSourceLocation on internal updates
If we're merely synchronizing to another view the source location has
already been taken care of.

Change-Id: I272c1f3a664271327d3a59d851632eb1241108a0
Task-number: QTCREATORBUG-13360
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:50:14 +00:00
Ulf Hermann
d1d694efb5 Properly clear input events model
Change-Id: I17b7e84605f93d421de7dcf0a0b02c6b922b2c4b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-16 14:42:07 +00:00
Marco Bubke
7fb4315da2 Clang: Adapt to new Google Test project directories
Google mock moved to github and merged with Google Test.

Change-Id: I66639532be1cd399c47dfd4511430b2d65b76b23
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-16 14:39:12 +00:00
Svenn-Arne Dragly
b604e91f5b Show folders as tree view for resources
This patch builds a tree view of the paths to files
in resource files.
Previously all files were shown in a flat structure
under prefixes with the entire path as part of their
displayed name.
Because folders based on prefixes are different from
folders in the paths, a new class, SimpleResourceFolderNode,
was introduced.

Change-Id: Ifc4773cff6a678b50e64b0d56713f80704e12f6f
Reviewed-by: Svenn-Arne Dragly <s@dragly.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 14:25:35 +00:00
Nikolai Kosjar
f7741ef63c Clang: Report only diagnostics that can be shown in the editor
Change-Id: I9c258159d240c6ba7eeff34702d8512d9220b3af
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-16 14:18:37 +00:00
Nikolai Kosjar
439db76f64 CppTools: Clean up CppCodeModelSettingsWidget
Change-Id: Iee93d2d656a8a5c991b292d3e591cedd3e86f9e3
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-16 14:18:30 +00:00
Nikolai Kosjar
48952084a6 Clang: Remove per-mimetype settings
Related to

    commit c47079f97f7d42db0c581525a2ce6fddbc0995f2
    Clang: Activate the code model with a check box

Change-Id: Ief11768ba0dd27788032e2dd3ad9b7ae39a8f52b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-16 14:08:25 +00:00
Tim Jenssen
db16798e0d JsonWizard: Enable directories as file source in file generator
Change-Id: I303f31311a619a86c5669ec7b15c341ab77a2c48
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 14:05:37 +00:00
Tobias Hunger
79f82d0d0a BuildManager: Provide context of earlier build steps to init
This information can be used to get information from earlier steps,
which e.g. queried for android devices to deploy to.

Change-Id: Iefe1c9443915cb6211f86f98ff7aaf3cb75145ba
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 14:04:59 +00:00
Tobias Hunger
cedf015c10 ProjectConfiguration: Clean up some constants
Remove unnecessary constant and move others into the cpp file where
they are used.

Change-Id: Ib1e8ac69a39eb38794bbdafc860ca42ca29c3bdb
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 14:04:40 +00:00
Leena Miettinen
140b39487b Doc: fix label text in docs
Libraries -> Library

Change-Id: I39117f76c332b2a08196e2e40551a64ba1d1b135
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-16 13:53:54 +00:00
Eike Ziller
2bcd2d4d04 EditorManager: Remove wrong warning
The mime type hierarchy is not a tree (e.g. diamond shape inheritence is
ok), so if we traverse a parent hierarchy and encounter a mime type
twice, that is not an indicator for an actual loop / wrong hierarchy.

Change-Id: Ic116deac5a03b9692e2267252598db6d8721f39e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-16 12:31:14 +00:00
Tobias Hunger
6d797a9097 Modeling: Fix warnings about hiding symbols
Change-Id: I434a80facf2d7550865277b32ce207908a50c48b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 11:17:34 +00:00
Tobias Hunger
468cbbaadd Fix warning about unused private member
Change-Id: Ib2f26efbc7fd2d3de13687b827c77f8022e850ec
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 11:16:45 +00:00
Tobias Hunger
a110abeed7 Remove unnecessary destructors
Change-Id: Id0bc2d3a305e6af24838266195ab22e04e3a12a1
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 11:16:17 +00:00
Topi Reinio
be1e793cdc Doc: Fix misaligned table headers
The first header spans two cells vertically, not three.

Task-number: QTBUG-49424
Change-Id: Id701fa2eadab0cf0c95297215330bfc29a119ee3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-16 10:38:45 +00:00
Adam Strzelecki
9b3723d6f4 CppTools: Do not highlight instantiation as call
Underlying C++ model sometimes marks C++ object instantiation using initializer
as a (forward) function declaration. This leads to incorrect highlighting of
object variables as if they were function calls.

C++ model however marks in this case (and not any other case) such symbols as
ambiguous function types, see CPlusPlus::Bind::visit. This change skips such
ambiguous functions for highlighting as function call.

Also add test case for related bug report.

Task-number: QTCREATORBUG-15212
Change-Id: Ifde8db407f2fa8275a3f991bfa3d3b73eca8c14e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-16 10:18:05 +00:00
Tobias Hunger
0e278e9efe ProjectConfiguration: Sprinkle override and explicit over the code
Change-Id: I2aa3a32a0d30f1d122977d94d4109227dea6bbd7
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 10:14:32 +00:00
Martin Kampas
87f6b92e34 Core: NewDialog: remember category & platform choice persistently
Change-Id: I80256a787c3a17ff9faaa46bbcef51035a7530a4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 10:13:55 +00:00
Leena Miettinen
d5decff558 Doc: rearrange the table on the front page
...into two rows instead of three.

This looks more symmetrical and seems to fit on the
screen also when using a low resolution.

Change-Id: Id2f9a7182a6a260036f3d8913058fd2aa7c24c57
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-16 09:34:48 +00:00
Tobias Hunger
ca29cbfc8a Consistently use Utils::FileNameList
Consistently use Utils::FileNameList in favor of QList<Utils::FileName>

Change-Id: Iafbb466c882bfd91c25c9e78f107d401bfdb6d55
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 08:33:02 +00:00
Orgad Shaneh
f910742979 Gerrit: Initialize all members
dependeOnNumber and neededByNumber were not initialized.

Change-Id: I12b90b842d540ae0e8ac9ff5be1be2ace2473ba8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-11-16 08:27:41 +00:00
David Schulz
69a4f80c69 WinRT: Fix C++ debugging when qml debugging is also enabled.
This is also a preparation to enable QML debugging. Unfortunately
the WinRT QML library isn't printing the needed "Waiting for connection"
output so far.

Change-Id: I5e106de0272a0876749aaf77f1ebf74b952d3471
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-11-16 08:15:46 +00:00
David Schulz
153d593b63 Modellinglib: Fix linking for msvc.
The Utils dependecy wasn't explicitly added to the project
dependencies.

Change-Id: I8f294cb2b220105c0cd83a3205594d00a051679e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-16 06:51:20 +00:00
Christian Stenger
9d465e4e04 TextEditor: Fix compile with Qt5.4
Change-Id: I35fabccf526446095b067ca6863b57474cef6ba5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-16 06:19:08 +00:00
Jochen Becher
be5d3c0a8e ModelEditor: Avoid identifiers reserved for compiler
Change-Id: I5519197e7308ddcfb0ac507ef9272de8d8eb9f19
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:40:02 +00:00
Jochen Becher
db95a3ec3a ModelEditor: Fix use of conditional code and preprocessor macros
Remove some dead code, debugging code and use of QMT_CHECK.

Change-Id: I04939484fbfa02ca6a816777c355f7db7d7f8077
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:55 +00:00
Jochen Becher
a441513596 ModelEditor: Fix use of Q_UNUSED
Change-Id: I379c9f0cd3ccc9fe4ef51c29ddd9de2b87b3e6c1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:49 +00:00
Jochen Becher
adb24b74bb ModelEditor: rename a lot of boolean attributes to m_is...
Change-Id: I4e4711d480de37b85870e18b89b035ba05be3ddd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:44 +00:00
Jochen Becher
356de5e26d ModelEditor: rename attribute m_busy to m_busyState
Change-Id: I5899f8aab2d6b5bc564bb9d18af04fbc863503d9
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:38 +00:00
Jochen Becher
f59555e190 ModelEditor: Rename nameSpace to umlNamespace
Change-Id: I177f6db40355277ce1227e033d6f259bc1574c91
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:32 +00:00