Commit Graph

44349 Commits

Author SHA1 Message Date
Jochen Becher
ffb306ffb7 ModelEditor: Set white diagram background
This is just a minimal workaround for dark themes.

Change-Id: I11de88dd39f24bd4d09a1c955e27a140eaad3850
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-12 16:49:19 +00:00
Jochen Becher
a5cf82b4e2 ModelEditor: Support text alignment with all object types
Change-Id: I9f67527ff21883194158f82039d3dcf513186150
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-12 16:49:11 +00:00
Jochen Becher
d12e74265c ModelEditor: Fix regression with item label
Change-Id: I081d30cb3451681d049a73fe2f0fb04f537bb437
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-12 16:49:01 +00:00
Christian Kandeler
304e1c0bba QtSupport: Move warning to QmakeProjectManager
Only qmake requires the build directory to be at the same level as the
source directory, but the warning appeared also for cmake and qbs
projects.

Change-Id: I2c2c39b0a6004bb4efe80bf6ff56c3f9e22ec51d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-12 16:01:23 +00:00
hjk
adcc3f0b76 ProjectExplorer: Remove unused convenience function displayNameFromMap()
Change-Id: I0165b5aa9155065e458d0b53c446dba349fbe6ff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-12 14:01:02 +00:00
Christian Stenger
b759960980 AutoTest: Remove pointless member
Change-Id: I1b5bd421e93bb6425e29941a21cfccc6cac5d6ce
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-12 13:55:40 +00:00
David Schulz
c2a195810f Bookmark: add locator filter for bookmarks
Change-Id: I9107356d52bbf6d1e77b30d7057b56efd670c724
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-12 11:56:30 +00:00
hjk
3f7f5b9a95 Use the .pro file path as buildSystemTarget in qmake based RunConfigs
That's what it is documented to be: It is set up from a
BuildTargetInfo::targetName containing the .pro file name.

Change-Id: Iabd1061960897125e1b09902d55661d42f481e26
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-12 11:04:01 +00:00
Christian Kandeler
3c75d3aec1 qbs build: Install debug info alongside binaries
... if separate debug info is enabled.

Change-Id: I15a02b11e7df18719074b9bc503fe2c207f8bf00
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2018-01-12 10:08:22 +00:00
David Schulz
8cecd73d2b Editor: show text mark icon while dragging
Change-Id: Ib8c3cbb6e298c3af5e159b18cb474f9b2baa1a83
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-12 09:20:06 +00:00
Tobias Hunger
e35acb3511 ProjectExplorer: Remove unused signal
Change-Id: I5b3d6a1e456389d852bebd27a83cf653bab12719
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-12 08:30:42 +00:00
Alessandro Portale
4239aab1c5 QmlDesigner: Clean-up scrollbar.css
...and make the scrollbar look the same as the scrollbars in the
QtQuickViews.

Change-Id: I15cd5a7f34efc744b74d6db2322b1aa084d09511
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-12 08:29:49 +00:00
Eike Ziller
326db43020 Merge remote-tracking branch 'origin/4.6'
Change-Id: Ie79cb18ea9db1cc8ec0d63fa1af90e07bd6e0917
2018-01-12 09:13:47 +01:00
Orgad Shaneh
01de1e1fbe Fix reading of user Qt versions, toolchains and kits
Broke by f42ea09b74.

Change-Id: I90be029caf80fc6efe89c3329a183b396e0dc564
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-12 08:11:08 +00:00
Christian Kandeler
c84ca9bd02 QbsProjectManager: Fix missing reparse on session loading
Task-number: QTCREATORBUG-19572
Change-Id: I71ccdf3abf370fb46dfbfd48a986674b50a04421
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-01-11 14:10:50 +00:00
Ulf Hermann
e1ad7a1784 QmlProfiler: Drop static accessors from QmlProfilerTool
It wasn't really a singleton even before. For testing purposes make the
client/state/model managers accessible.

Change-Id: Ie5efbc47a6b9119495f999e4e05877d4789da407
Reviewed-by: hjk <hjk@qt.io>
2018-01-11 14:04:13 +00:00
hjk
7d039de7a8 PythonEditor: Fix run configuration
This amends commit 53a151074a.

Change-Id: Icf171667b6d03802e0be615c8c7b9491b8d6fd54
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-01-11 13:51:50 +00:00
Orgad Shaneh
e75dd28d0c ProjectExplorer: Fix build with Qt 5.6
Change-Id: Icb9cae9c5baaa5cdc2dd6dca2bb493cdf0d73012
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-01-11 13:48:43 +00:00
Eike Ziller
4ab6ae3506 Merge remote-tracking branch 'origin/4.6'
Change-Id: I0813763b7618c682b5fbb197273a1c8911cd3d7d
2018-01-11 14:38:40 +01:00
Eike Ziller
9d03865ce3 Merge remote-tracking branch 'origin/4.5' into 4.6
Change-Id: I88e4d82b9453274fa2575332aa465cb965e20808
2018-01-11 14:34:52 +01:00
hjk
a0753d7c34 ProjectExplorer: Simplify BuildManager::buildList() calls
The build list names are always the ones determined from the
build list id. No need to do that on the caller side.

Change-Id: Icc21ef355de535af21215819fe04daa76fed0d9c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-11 10:49:56 +00:00
hjk
4b7c82b131 QmakeProject: Centralize some code for subproject runconfig handling
Change-Id: Iecd8c326fc7fd1b1e7e5406fd899befc9fdd3c5b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-11 10:49:27 +00:00
hjk
048a05584c ProjectExplorer: Fix handling on restrictions of usable kits
Fixup after 45d6a34f: An empty list of target device restrictions
means 'no restriction'.

Change-Id: I15773e75e58c3ba543d62e13d728cf08dccc3650
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-11 10:48:14 +00:00
Eike Ziller
f42ea09b74 Do not construct settings/resource paths from QSettings object
These paths are controlled by ICore.

Add ICore::installerResourcePath() to replace constructions with
settings(SystemScope)
Replace constructions with settings()->fileName() by usage of
ICore::userResourcePath().

Change-Id: I5a9fa9d09f2563c39dc5d11a4586da825c62f9ac
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-11 10:42:09 +00:00
Eike Ziller
f3d7208aa9 Use IDE_ID in sdktool
Change-Id: I83d5e13b57cf6c358506c1f07459632bfa4bff52
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-11 10:32:30 +00:00
Tobias Hunger
4f49b46eaa Project: Add some basic tests
Change-Id: I2b60c9df93700a8aa659adceee4e00cf46584a5b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-11 10:32:02 +00:00
Jarek Kobus
57e27915f4 Fix includes
The missing headers were included indirectly
through the QHeaderView, QButtonGroup or QAction
inside the generated ui files.
Now, the generated ui files won't include QHeaderView,
QButtonGroup nor QAction, so we need to include the
missing headers explicitly.

Change-Id: Ife6c4e2c39b2b2b7d8365cc5ae2dbb6de4b3ac66
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-11 10:24:25 +00:00
hjk
c39eb08ac4 QmakeProject: Make availableBuildTargets return a BuildTargetInfo list
It's what the "consumer side" expects.

Change-Id: I1a4e75eda09f8626fcf65290e6c58a08eed9fdca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-11 09:42:35 +00:00
Nikolai Kosjar
54160400e9 Clang: Add logging category for ClangCodeModelServer
This one helps to understand when and why some jobs run.

Change-Id: Ibbafe517cb38bb9b68b73c78aaba0805f11b3964
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-11 08:09:55 +00:00
David Schulz
ec9c2f78d8 Bookmark: const correct BookmarkManager::gotoBookmark
Change-Id: Id6118c741d0f21b9c6b968939769ca2ab3d683fd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-11 07:56:11 +00:00
Orgad Shaneh
6285a6e50f CppTools: Fix build
Broke by e51683412b.

Change-Id: I68d1457931f2237a63da4ac2e34f1650b9ff6ea6
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-11 06:46:15 +00:00
David Schulz
319990d7c5 Core: return QMainWindow * from Core::mainWindow
... instead of QWidget *

Change-Id: Ibe38814ae26524a9ffa4c14d170d5aa487a40931
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-11 06:35:27 +00:00
Ulf Hermann
ff182d1c97 QmlProfiler: Guard state widget against unexpected deletion order
If the model manager or the state manager disappear before the parent
widget, we might still get a timer update in between.

Change-Id: I6a67868615ef9d570e2ce438d9d9bd88b1035cc2
Reviewed-by: hjk <hjk@qt.io>
2018-01-10 17:04:23 +00:00
Alexandru Croitor
ee70917f29 Add qtwebengine backend to qbs help plugin build rules
Change-Id: I924637581741dc68d94270cc680df20499778b03
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-01-10 15:47:27 +00:00
Jochen Becher
4d99f47974 ModelEditor: Implement shared clipboard between all open model-editors
Change-Id: Id2eb6f78f8aa1a698a49d35db6cfceab14a38e0b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-10 15:39:45 +00:00
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
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