Commit Graph

44349 Commits

Author SHA1 Message Date
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
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
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
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
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
Eike Ziller
cff2cc90e2 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/cpptools/clangcompileroptionsbuilder.cpp
	src/plugins/cpptools/clangcompileroptionsbuilder.h
	src/plugins/cpptools/compileroptionsbuilder.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.h
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.h
	src/shared/qbs

Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010
2018-01-09 13:13:00 +01:00
Orgad Shaneh
a8ddaafca4 Git: Introduce Recover Deleted Files action
Change-Id: I913c07522a8ca82366fd142597430c02e53faa27
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 11:33:21 +00:00
Mitch Curtis
62a3d16950 Add tooltip to distinguish between identically named dependencies
Task-number: QTCREATORBUG-16781
Change-Id: Ia11845a8509d1f02a59c4abdef7089678d6b277a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-09 09:10:43 +00:00
Ulf Hermann
1e0ea7f42e ProjectExplorer: Remove target/BC listeners from ExtraCompiler
When target or build configuration change, the target files that
ExtraCompiler checks to see if a rebuild is necessary will be outdated.
The project managers recognize that and reinitialize the ExtraCompilers
in that case. Thus, we don't need to listen for those changes in
ExtraCompiler.

This has the added benefit of reducing the number of transparent
rebuilds triggered by ExtraCompiler.

Change-Id: If8b55f0f5343b221c039d4bd4a8f0c3ab412cc94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-09 07:51:38 +00:00
Ulf Hermann
874ec43abe Timeline: Don't use JS arguments in signal handlers
... and the parameter has a name after all.

Change-Id: I762474dfde29e8445fe69cf7361702a1a447e1bd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-09 07:49:50 +00:00
Orgad Shaneh
68969b0b2a ProjectExplorer: Fix build with tests enabled
Broke by 5ec29538.

Change-Id: I5fe15aba818b7e6fe64d5c13225109700e43b166
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-09 07:39:31 +00:00
hjk
4e19b3609e ProjectExplorer: Remove *Configuration::availableCreationIdsChanged
Unused and apparently unneeded.

Change-Id: I58fab4e426b7daeac5a68887b5eacfeeb17013d3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-08 16:48:55 +00:00
Tobias Hunger
5ec295383d UserFileAccessor: Add tests
Change-Id: I310fdd542f0629a2353229be3e479a9f916fec19
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 15:46:44 +00:00
Nikolai Kosjar
5f8ac59ef8 Clang: Fix tests without any ASSERTs
Change-Id: I3148cb85271ab021832caa5bd09dedb6aeeef49f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-08 15:21:23 +00:00
Ulf Hermann
747818291d QmlProfiler: Test that attachToWaitingApplication tries to connect
Change-Id: Ic71cb60b70e9b68e455795511594a6be5739eb5f
Task-number: QTCREATORBUG-19496
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-08 15:14:27 +00:00
Nikolai Kosjar
b08f15a36b GLSL: Auto run qlalr generator when explicitly requested
...because we support building Qt Creator with multiple Qt versions
(different qlalr versions), thus the generated source files might/will
differ.

Done-By: Christian Kandeler
Change-Id: Ib38d2a73704a030627b716f6f5b4a1e5c6a8ad14
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-01-08 14:53:10 +00:00
Ulf Hermann
da1453a13d QmlProfiler: Allow QmlProfilerRunner::stop() without profilerState
This can happen because a run control may already initiateStop when in
Starting state.

Change-Id: Ie872cb1ba5d0ff65eb1c82ff90f9659311e534f4
Reviewed-by: hjk <hjk@qt.io>
2018-01-08 14:50:49 +00:00
hjk
1ec9d76e2b ProjectExplorer: Promote RemoteLinuxRunConfigFactory::availableBuildTargets
This was already almost the desired final pattern, so make it the default
implementation of ProjectRunConfigurationFactory::availableBuildTargets.

For the only remaining feature of "decorating" the build target names,
introduce a property m_displayNamePattern.

Un-adapted sub-classes still need (and are able) to overide.

Change-Id: Ia7d2d2f7d53f8b1da487fa82c8265ad5deb47500
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-08 14:07:45 +00:00
David Schulz
30d733a2e1 Editor: initialize block count after duplicate
Task-number: QTCREATORBUG-19550
Change-Id: I0f93823ca919a269b07412103715a0fe0a8adeb8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 13:57:43 +00:00
Orgad Shaneh
e744e6677c Project: Fix bad comparison in isKnownFile
Broke by 43f57d3f31.

Task-number: QTCREATORBUG-19523
Change-Id: Id154f680b85d0238cf096fb0d56c779309c9f598
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-08 13:43:26 +00:00
Robert Loehning
8e6fa26c83 Fix warning about supposed out-of-bounds access
Change-Id: I996dafc272076fe62209ebee5c44f7d9caf19302
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 13:43:01 +00:00
Nikolai Kosjar
e3b1259004 Clang: Introduce DocumentParsed as job requirement
This is in prepration for a follow-up change, which introduces a state
where the Document is not yet parsed (it was reset) but the queue has
jobs.

All jobs get this requirement except those that generate an AST.

Change-Id: Ifcbb704e54108b40797180514c5ad3f3768ef10b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-08 13:18:54 +00:00
Nikolai Kosjar
1d936177a0 Clang: Fix typo
Change-Id: Ib6da2189f79c9f2306db6dd1f8292e3944f7ecd2
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-08 13:18:43 +00:00
Marco Benelli
d11e31230c QmlJs: remove bundles for QtQuick1 type descriptions
QtCreator now assumes that QtQuick2 is used, so the relevant bundle is
loaded unconditionally.

Change-Id: Ib6b7b0c9a949e74edf0e0b7f68b0c774d7bcb451
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-08 13:15:23 +00:00
Orgad Shaneh
fdf95a2fe7 Wizards: Fix project file name in root directory
If the common directory is root (such as "/", "D:/" etc.), the first
character of the project file name was chopped.

Change-Id: Ic2b81fd2f95e4d2a0bdb5e93ade243c3e1029893
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 13:13:17 +00:00
Christian Stenger
8c6c9fa2a8 Utils: Remove directory icon
This icon had been moved already, but its declaration
and definition were still present.

Change-Id: I7e0f5cc91f83ac19e9bba9838b1fbc4d7258c6c7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-08 12:50:27 +00:00