Commit Graph

54723 Commits

Author SHA1 Message Date
Eike Ziller
0be914853b Use IDE_ID for user resource path
We should not share these settings with a different IDE_ID

Change-Id: If50102606722f40ab64c9c7fe01c74a9f0dda06e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-10 15:36:36 +00:00
Eike Ziller
1e77f48251 Fix that translations did not work after setting IDE_ID
We currently do not actually rename any resources.

Change-Id: I4ebaa4924d6358af63dca7611e64fe53835252d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-10 15:36:23 +00:00
Thomas Hartmann
63cd9cd780 QmlDesigner: Refactor DesignDocument and DesignDocumentView
We want to be able to reuse the copy and paste code in other parts.
Therefore we move most of the code to DesignDocumentView.

Change-Id: Ia0de109e92b128aef4c18255621767280e0dcfef
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-10 15:15:44 +00:00
Thomas Hartmann
9e2908df41 QmlDesigner: Forward declare class
Change-Id: Ib9efffdd8befb254bb4a7e83f84a9265459d454d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-10 15:11:37 +00:00
Thomas Hartmann
c166e8a9bf QmlDesigner: Cleanup code
Change-Id: Ie6954e3cac3cdadcaaf53e349f6c884b1ddf8d23
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-10 15:11:28 +00:00
Tobias Hunger
bcc550a4e2 Project: Always report the main project file
Always report the main project file in Project::isKnownFile(...) and
Project::files(...).

Change-Id: If9b9cc205e3419a457b05b368cb524c982cbc18c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-10 14:07:28 +00:00
Tobias Hunger
a1af407f53 Project: Add mimeType() method
Add a method to retrieve the mime type of a project.

Change-Id: I9ae2cab987780597561a5ee164e2c2b9b9445e68
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-10 13:29:46 +00:00
Thomas Hartmann
7844c83493 QmlDesigner: Add checkKeyframesType
This works inside copy/paste models in which we do
not have instances.

Change-Id: I71f08a68d62c3f7a66eabb47f7399eb6fb5847aa
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-10 13:29:40 +00:00
Tobias Hunger
c20ac40ae3 Project: Make sure id() will never change
Warn and ignore attempts to change the id() of a project.

Change-Id: I26c7c585e87d8be7b9fb8da3b3685b252e05f070
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-10 13:29:40 +00:00
Tobias Hunger
58899a6b70 Session: QTC_CHECK that projects are fully set up
Do QTC_CHECK to warn if a new project is not fully set up.

Change-Id: Iafeac9ed5bd62bd57754015aed832848e50b037a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-10 13:28:24 +00:00
Marco Bubke
2c08ddcd5a Clang: Add path notifier to symbol indexer
Change-Id: I2a605a5a5ac2511566edd9c069e84b5ec9d95279
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-10 12:38:47 +00:00
Marco Bubke
e94d88c172 Clang: Cleanup symbol indexer test
Change-Id: I1cfa70d092d27949e0cf9466b190afbc40c1a591
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-10 12:38:39 +00:00
Marco Bubke
6454e336e5 Clang: Make ClangPathWatcherNotifier non copy-able
There is already a destructor because the vtable should not be
injected in every translation unit. Because of the rule of five
we have to provide or omit the copy and move functions. So
we delete them because we don't need them and any way
it would be not smart to have to notifier.

Change-Id: I35c00954eaa4e1bb299581a5e4ba5369d5cbf1cd
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-10 12:38:28 +00:00
Marco Bubke
6f8f8d0cbf Clang: Extend ClangPathWatcher to communicate path changes
Change-Id: Iad2d6adc53fbc2ee32fd63b9ccdc8999d41a89da
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-10 12:38:16 +00:00
Marco Bubke
98fa7cbb3f Clang: Use FilePathId in ChangedFilePathCompressor
Change-Id: I622d9196ec12c6fe6e07ef9c953586f2f40b9a5c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-10 12:37:37 +00:00
Ulf Hermann
bb07cc280c QmlProfiler: Reduce retry params for testConnectionFailure()
This greatly reduces the test execution time, hopefully avoiding the
test function timeouts. As we know that all the connections fail, a 1ms
interval should be enough and retrying twice should be enough to
exercise the retry path.

Change-Id: I24e61aa1957313dc16b7e46f7a7de7ae483e82dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-10 12:14:48 +00:00
Vikas Pachdha
45d6a34f1e Android: Fix BuilConfiguration priority calculation
Check the supported devices and return the base priority set by the
factory implementation

Task-number: QTCREATORBUG-19573
Change-Id: Ieae68a618d625b3f16f205e544f4626e6a410b91
Reviewed-by: hjk <hjk@qt.io>
2018-01-10 11:37:57 +00:00
hjk
2549b9237e QbsProjectManager: Fix build directory of additional build configs
Change-Id: Ifa8cad542692b774ef91d0d4f5473c7baa1bb1ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-10 11:00:39 +00:00
hjk
0955eefb8a Add a minimal automake project for testing purposes
Change-Id: If2127f2baf79716517e85661a3c657d689d84d67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-10 11:00:26 +00:00
Ivan Donchevskii
e51683412b ProjectPart: save codegen flags in project part
And add them to other clang code model arguments.
These flags provide architecture for cross-compilation
when ios kit is selected.

Task-number: QTCREATORBUG-19437
Task-number: QTCREATORBUG-19430
Change-Id: I7a485f49d637371bb28b2096086d7d8a4b0c404a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-10 10:59:56 +00:00
Christian Stenger
8c4dcda6d4 AutoTest: Turn frameworks widget from list to tree
Preparation for adding more settings to the frameworks.
We need more columns for this purpose, so use a tree instead
of a list.

Change-Id: I73a1bb09625957986e857e4926009118a7ccaa32
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-10 10:46:44 +00:00
Thomas Hartmann
50ca0de846 QmlDesigner: Add missing font and text properties for Qt 5.10
Task-number: QTPM-862
Change-Id: I12813cf429f4f4a5a85c4e3c6d74eb7ac1a45bd2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-10 10:30:59 +00:00
Eike Ziller
699dd2c426 Make IDE name and ids configurable at build time
Make it unnecessary to hack app_version.h.in for that.

Change-Id: Ibc3bf332916ab9f293b6782d3b5a40078dbd7bcb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-10 08:45:59 +00:00
Orgad Shaneh
8d523f1900 Qbs: Use right path for Qt libraries
Similar to 85206e216a for qmake.

Unify the lookup logic in BaseQtVersion.

Change-Id: Id0b0ff3127f0561ac36610ada16110b55252eb31
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-10 08:38:33 +00:00
Orgad Shaneh
ade307d807 Qmake: Move Qt library path after other libraries
Paths are prepended, so the first one to be added is actually the last
search path.

On a debian machine with system-installed Qt and Qbs, if you execute Qtc
from another instance of Qtc with "Add build library search path" checked,
LD_LIBRARY_PATH has /usr/lib/x86_64-linux-gnu before $BUILD/lib/qtcreator.

This means that the system's Qbs lib will be loaded instead of the one in
RPATH, which is bad (i.e. qbs build fails because it cannot find
$BUILD/lib/x86_64-linux-gnu/qbs/qbs_processlauncher).

Change-Id: Ibe6778ba8a06da1680e034e31a8fee6d9a81c484
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-10 08:38:20 +00:00
hjk
80bd696270 QmakeProject: De-virtualize some QmakePriFile functions
Some left-over from the time they were nodes. It's not used
polymorphically anymore.

Change-Id: I98e75eb5378abdf27e4538041b07c09fa1f9fcc5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-10 07:04:01 +00:00
hjk
b4faec80ba QmlJSEditor: Create QuickFixes directly
So far there have been factories instantiated and maintained to get
a list of 'matching' operation by iterating over the factories'
match() functions. The same effect can be achieved more directly
by calling stand-alone functions.

Change-Id: I868489d36f9d8339e0d8855d832df8400501026c
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-01-10 07:03:49 +00:00
Christian Stenger
e4eb4c3d0f AutoTest: Correct updating of summary items
If we get no finish message for a test case or function
we did not update the result of the summary item.
This patch fixes this and also updates the respective
parents accordingly.

Change-Id: I98a8c69735f89d592f6152dbbc7a632e285c3a4d
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-10 06:06:50 +00:00
Alessandro Portale
8dca82bd9c Modelinglib: Fix missing M_PI on msvc
error: C2065: 'M_PI': undeclared identifier

QtMath makes it work on different compilers.

Change-Id: I012f4a5f6d3e2c9c8680b606a92f4898618a9dae
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-01-09 18:48:01 +00:00
Ulf Hermann
58ae456f4b QmlProfiler: Verify attached RunControl stops when connection closes
Change-Id: I2b7bd63c4e84fcb0e78318f810ed54e58468d05e
Task-number: QTCREATORBUG-19496
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-09 17:02:05 +00:00
Thomas Hartmann
becbcd4455 QmlDesigner: Add global focus enums
Task-number: QTCREATORBUG-19563
Change-Id: I0b61d79e1765468450a91d2a712d04ed473d3c89
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-09 16:48:06 +00:00
Jochen Becher
58a1648326 ModelEditor: add wizard for scratch models
Change-Id: Idc6841984aa258ab668416f891ecbaf7bd32164e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:53 +00:00
Jochen Becher
6bb2c1196d ModelEditor: Add Deployment diagrams
Change-Id: Ib8c9ce2dff3fc9d52ff35f2ad89d8c281683200e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:43 +00:00
Jochen Becher
ceb77b9aae ModelEditor: Fix endless loop in config-file parser
Change-Id: Ia903974b97c81807a3296e6afd18173655867047
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:34 +00:00
Jochen Becher
56babf50ee ModelEditor: Improve toolbar icon rendering
Change-Id: I11e523117dd192dc8450a0b5b2cca92f7b0ef166
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:22 +00:00
Jochen Becher
991a9ce5c1 ModelEditor: Minor improvements of documentation
Change-Id: Iec789a3bd89136c3346f6ce8db636c069d7c842b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:13 +00:00
Jochen Becher
b567a080e2 ModelEditor: Fix toolbar icon rendering on HDPI screens
Some high DPI icons are still missing. But icons rendered from
stereotype definitions get the correct size and look much better.

Change-Id: Iabd8283e9bd0ae7e074471a065d009ac5c5836cc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:03 +00:00
Jochen Becher
09bdb4f8cd ModelEditor: Implement new feature "add related elements"
Change-Id: Ifff6696204546a99af714d96078d1b2ff4cd6e3c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:22:38 +00:00
Jochen Becher
a3f4a6baa6 ModelEditor: Implement modifier to move swimlanes only
Holding down Shift + Control while selecting a swimlane will not select
the elements below/right.

Change-Id: Ibb594add3389cf559e635f5cce9ba6c6948684ec
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:22:29 +00:00
Jochen Becher
4be71d3179 ModelEditor: Set correct sceneRect when opening diagram with swimlanes
Change-Id: I66a025695c44112fd4e8c532eed17a0d38c60a90
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:22:19 +00:00
Jochen Becher
959d577920 ModelEditor: Introduce new role "Flat"
Display items flat filled instead of using gradient.

Change-Id: If91bed451a92993e9cf798f019cad52a0062b02c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:22:06 +00:00
Jochen Becher
13a3710477 ModelEditor: Allow selecting an overlapped boundaryitem
Note: The change in diagramscenemodel.cpp is just to make a method
public and keep the order (public before private). No other code change
in that file.

Task-number: QTCREATORBUG-18368
Change-Id: I15193d90f81aaee81f357a4d82eeeb74bb1f0583
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:21:56 +00:00
Jochen Becher
9c8086610e ModelEditor: Improve export of diagrams
Implemented new menu item "Export Selected Elements" exporting only
selected elements from diagram to image file. The existing menu item
"Export Diagram" exports the whole diagram always. In both cases any
selection will be removed from the diagram before export and restored
afterwards.

Task.number: QTCREATORBUG-16689

Change-Id: If9ad5d38a690fe8dc4b18624d0ddc81618b117d1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:21:46 +00:00
Jochen Becher
cdc5b9265b ModelEditor: Implement Drag'n'Drop for most panes
Components and classes may be dragged and dropped not only from project
explorer but from any pane that allows to drag and drop a file.

Task-number: QTCREATORBUG-19117
Change-Id: I4c39e3771d37c0aed4b00204db0876e6b9093828
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:21:35 +00:00
Jochen Becher
e8b3b9b1e4 ModelEditor: Support multi-line object names
Editing a name of an object at a diagram press Shift-Return do insert a
line-break.

Change-Id: I3f7d185823d7d5f33bc796bfedb058706f78b4f2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:21:22 +00:00
Jochen Becher
0c7ce54cc6 ModelEditor: Support text alignment in custom icons
Change-Id: I69a5b10a3bf46d40744b002eea47fa926a617c17
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:21:10 +00:00
Jochen Becher
eceaf47614 ModelEditor: fix text labels in sequence diagrams
Change-Id: I7825a65a6c27c5c48bc1b8e6b6b4e532b252bc5d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:20:58 +00:00
Eike Ziller
c44c4392ae Merge "Merge remote-tracking branch 'origin/4.5'" 2018-01-09 12:44:32 +00:00
Przemyslaw Gorszkowski
e25edc5020 Git: add reload button for 'git blame' and 'git log' windows
Change-Id: I64685e779bed91d41e38bdc1454571dbbcd7f177
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 12:28:26 +00:00
hjk
6bb7da79de QmakeProject: Remove proFilesEvaluated() signal
It's not really different from Project::parsingFinished.

Adapt users.

Change-Id: I47d23469df2ec52c5d823508772a7e8b8ad429ce
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 12:23:56 +00:00