Commit Graph

50929 Commits

Author SHA1 Message Date
Tobias Hunger
be52000061 ProjectTree: Polish
Change-Id: Ib5c2af6385c8655c0e3ba8996edfc1d4c0640874
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 15:09:38 +00:00
Tobias Hunger
94c33d95ed ProjectNodes: Remove recursiveFileNode
Change-Id: Ibde61428517b187c84eca9293b17f8f665fb38ae
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 14:45:03 +00:00
Eike Ziller
c71b0baa0e Merge remote-tracking branch 'origin/4.3'
Change-Id: Ic5f4562a5845a518a3d8450085daf77eccd1b938
2017-03-10 15:40:55 +01:00
Eike Ziller
0467aa5c90 Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: I2f32404f36ed885e78a7616da2f686943a8c8471
2017-03-10 15:38:01 +01:00
Eike Ziller
ef470a1d10 Add documentation sub-targets
To make it possible to build individual documentation sets with targets
html_docs_<name> and qch_docs_<name>.
Keep using the && chained commands for the (html|qch)_docs targets
though, because we had issues with parallel documentation creation
before.

Change-Id: I80556bfaddb79aec3da3e09e4d4843b5d33be451
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-03-10 14:34:50 +00:00
Oswald Buddenhagen
330f63a8db fix doc navigation links
Change-Id: I0d05947ce6a9caef73c91ba9645bc305000a1794
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-03-10 13:20:22 +00:00
Christian Stenger
1ffd752e02 Squish: Fix suite_qtquick
* adapt category label to expected
* adjust to removed library wizard

Change-Id: I799882c9c7557c5d7f4c36fb4d2198f8e586b435
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-03-10 12:48:43 +00:00
hjk
42c68ad7b5 Debugger: Remove libUtils dependency from some tests
libUtils nowadays depends on Qt Declarative, which is not necessarily
present in pure test setups.

Change-Id: I8c40d086186ccf047c034345126f088f53652dbb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-10 12:15:17 +00:00
Orgad Shaneh
4136e36c6f Algorithm: Add a member variant for transform
Change-Id: I329ee764cc13dd8b794c6769a2baf2f41d6a9983
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-10 11:37:03 +00:00
Eike Ziller
bc562bbea9 Quickfix for building Qbs documentation
Change-Id: Iad6690ffb1578040739ca0d5bb26ca701454ec7b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-10 10:35:50 +00:00
Orgad Shaneh
278f9bf993 Merge "Merge remote-tracking branch 'origin/master' into 4.3" into 4.3 2017-03-10 10:17:22 +00:00
Robert Loehning
5f95b61b2b qmljs: Remove dead code
Change-Id: I2b9cdf9960a28c952905e11332f029e1503850ce
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-10 10:00:58 +00:00
Orgad Shaneh
b14886cb94 Merge remote-tracking branch 'origin/master' into 4.3
Change-Id: Iab55f10105f1eced67ea74cfadf10f95b3c29b97
2017-03-10 11:03:58 +02:00
Leena Miettinen
e67db17c09 Doc: Update documentation writing instructions
The location of the TOC file and the built documents has
changed. Qt WebKit has been deprecated. Added a link to doc
build instructions.

Change-Id: I1718e1c706a7e3fd34d2fa44116c0d5631b50f5e
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-10 08:57:21 +00:00
Nikolai Kosjar
5455a45784 Clang: Compile against llvm/clang 4.0
Task-number: QTCREATORBUG-17692
Change-Id: I2781129543c09aa64938c9570896d592b57a753c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 08:48:45 +00:00
Nikolai Kosjar
f6e75c43d1 ProjectExplorer: Use default text when cloning build/run configuration
Change-Id: I520d1120b1f17522601e628eb2588eb2d0aee074
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-10 08:48:10 +00:00
Montel Laurent
c343290f63 Add spacer between widget and dialogbox button in filternamedialog
So layout is ok when we resize dialog

Change-Id: I15c338bfb48e4fa3500e4a2d3ebe85d227586c76
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2017-03-10 08:43:10 +00:00
Thomas Hartmann
0822065ed2 QmlDesigner: Fix crash
Change-Id: I3cee292d9567877fb159985dbf837f61ecb83baa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 08:25:01 +00:00
Thomas Hartmann
ee403cb013 QmlDesigner: Hardcode hints for SwipeView
the hints will be added to Qt 5.10.

Change-Id: I5e9ee09c99376e69c2890923834ee6b4141e48e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 08:24:51 +00:00
Thomas Hartmann
23d9d05d2c QmlDesigner: Only allow adding TabBar if import is present
Change-Id: Ie6128870943ce3769b7f93ef4cd098fdb331a288
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 08:16:32 +00:00
David Schulz
5458edc32f Debugger: Add a deploy python target to the cdb extension project file
Change-Id: I35297633d0703a0132e1632fbbc65368a2279f29
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-10 06:36:14 +00:00
Andre Hartmann
209cc21434 Git: Add input validation to RemoteAdditionDialog
Use FancyLineEdits to indicate invalid inputs for
remote names and URLs.

For remote names:
* Check for duplicate remote names and indicate these
* Remove invalid chars during input

For remote URLs:
* Check if the input matches a valid URL or
  existing local directory

Task-number: QTCREATORBUG-15998
Change-Id: I224e669f16e34e2cd3d075c602b431ce5bbdd391
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-09 22:03:05 +00:00
Andre Hartmann
b0ac6435b3 Git: Add new class GitRemote
Allows to split a remote URL and performs
some validation checks on the elements.

Change-Id: I048373076b1a1553fdd7bed2986a41cc087138b0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-09 22:02:30 +00:00
Andre Hartmann
6e7d2a4001 GerritServer: Using namespace Git::Internal
Change-Id: Ibce01855a8dcc2ca9dd3ca0a91b062508d42907c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-09 22:00:56 +00:00
Robert Loehning
f4c0c78002 Revert "VCSBaseEditorParameterWidget::mapSetting cope with 0 pointer"
This reverts commit b5ce5e9086
because the check already happened two lines before.

Change-Id: Ic230fe767c22dc4747a4ceecedd68fc09c99267b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-09 17:37:11 +00:00
Tim Jenssen
1a822b98ed Theme: remove unused variant map
Change-Id: I33f6418b476f94e7e862bc7f155f9b4242d5f287
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-09 17:20:49 +00:00
Tim Jenssen
1de5bbd378 QmlDesigner: introduce a real Theme class
- rename Theming -> Theme
 - made derived colors as Q_INVOKABLE methods available
 - rename registerIconProvider -> setupTheme
 - inside *.qml files use a singleton import instead of a context

Before this change, every request for a theme value copied the map into the
Qml context including the convert of values QVariant -> QJSString

Change-Id: I1c483fb591336b519d5adab8ad37b42bc5a06720
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-09 17:20:36 +00:00
Tim Jenssen
e6e71e385e Theme: enable inheritance without private knowledge
Change-Id: Id0ff90a92964fb213db50d11df832333cfb56716
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-03-09 17:20:16 +00:00
Serhii Moroz
0e4b233685 RemoteFilterOptions: Add ability to re-order items in the list widget
Change-Id: Iada4b63f13ba1e6875b414eb6ee710209b0b75df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-09 15:38:10 +00:00
Eike Ziller
9c736b68f5 Include doc/ in dev package
Change-Id: I64798d47d9f28826295d555432e3a1f63bbdde20
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-09 15:00:16 +00:00
Robert Loehning
8f3fda10ff Squish: Update tst_HELP06 after fix
This reverts commit 2cd684b092.

Change-Id: I6543f96efa227e398dabaa14538ecc1f3174b757
Task-number: QTCREATORBUG-10585
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-09 14:59:03 +00:00
Nikolai Kosjar
8a076e3f4b CppTools: De-duplicate and rename function in ProjectPart
Change-Id: I675ce4c9059d8ae4046f6a13aa7c04b88141d443
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-09 14:35:29 +00:00
Tobias Hunger
1b9c18951a ProjectNodes: Make folderNode(FileName) method inaccessible
Change-Id: Ie355ea8fd5e909e9c3e6e2630faabe366d02051a
Reviewed-by: hjk <hjk@qt.io>
2017-03-09 14:29:11 +00:00
Tobias Hunger
aa51fd3962 ProjectNodes: Make recursiveFindOrCreateFolderNode private
Change-Id: I43315f19d931bec0ad7b81d3c72a4e7486f70445
Reviewed-by: hjk <hjk@qt.io>
2017-03-09 14:29:03 +00:00
Jarek Kobus
1a5bdf14ad Fix a crash when configured kit list is empty
Task-number: QTCREATORBUG-17841
Change-Id: I73453c12d264961c6d766fbc58ceb1468104833c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-09 13:54:52 +00:00
Tobias Hunger
546df41853 ProjectPart: Add callGroupId
Do not rely on the projectfile being unique anymore.

Change-Id: I52e63b3ac8aeca43ef70af1d59d1d8612bd3540e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-03-09 13:50:08 +00:00
Tobias Hunger
cee92463f7 ProjectPart: Allow for line/column information in project file
Keep this information separate so that plugins using the information
do not need to start parsing the project file.

Change-Id: Ibecf431de1b12bbe820c6f8f9c986cffeb4972d2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-03-09 13:49:36 +00:00
Nikolai Kosjar
8187141b4a C++: Avoid printing to stderr and calling exit()
We are not a compiler.

Change-Id: I57d8283759d2587b890ff9bc1ca0c173cd910683
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-09 13:26:18 +00:00
hjk
db1e1db1e2 Debugger: Remove some test code constructor
Accidentally leaving out the comma was a needless extra source of errors
shifted from compile to (test) run time.

Change-Id: I02db60b5e4648545cb869738d009b91720827f93
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-09 12:37:52 +00:00
Eike Ziller
69276d81c5 Merge remote-tracking branch 'origin/4.3'
Change-Id: I55bec11cc6638a7d71020ced7f686e1610e4d9d5
2017-03-09 12:43:23 +01:00
Eike Ziller
cec29f34ea Merge remote-tracking branch 'origin/4.2' into 4.3
Conflicts:
	doc/src/qtcreator.qdoc
	tests/system/suite_general/suite.conf

Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
2017-03-09 12:14:55 +01:00
hjk
c1bfc5d8ec ProjectExplorer: Follow up on too-much-magic in IProjectManager
Use a ProjectManager::registerProjectType<Project>(MimeType) function,
removing cryptic IProjectManager object ownership.

Change-Id: I212cd25bd4ee757022a8cb0decb4b8de3a112d12
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-09 10:41:33 +00:00
Thomas Hartmann
34c16ed7bc QmlDesigner: Fix usage of doesLayoutChildren
Change-Id: I23158401eaa869cb258d5e1c6484d52e6760b4c9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-09 10:24:43 +00:00
Thomas Hartmann
19f74fadd2 QmlDesigner: Fix forceClip
We have to set clipping in the right places.

Change-Id: Ifc4b1a91cd488b492d1dcd5c420fc7a5ac311fdb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-09 10:24:34 +00:00
Thomas Hartmann
f635e2e305 QmlDesigner: Use proper constant for actions
Change-Id: I74c6136eec83805130553fc36bac383078f3ab93
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-09 10:24:24 +00:00
Thomas Hartmann
dc375f9d00 QmlDesigner: Fix indentation
Change-Id: I839ab790a6ccb3cc4a1cb46f98c0f2cd9936e599
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-09 09:32:18 +00:00
Eike Ziller
33fa4b401c Create a reusable docs.pri for generating documentation
Since we cannot directly use qt_docs.prf since it contains
various Qt specific details, adapt it for use in Qt Creator.
This can then be used e.g. by plugins that are not part of the
Qt Creator repository.

Change-Id: I87511cad74cbcae5cb58087e9a9386130d635aa9
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-03-09 09:30:42 +00:00
Leena Miettinen
0ed42f1c9f Doc: Move the TOC to a separate page that is used as indexTitle value
This fixes the problem that the whole TOC is not visible in the
Qt Creator Help mode Contents view (because it was generated based on
the \table entries, not the \list entries).

Task-number: QTCREATORBUG-10585
Change-Id: I86607e10db7172b2a7492e4ce1660c39390ef9ed
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-03-09 09:13:27 +00:00
Andre Hartmann
57144e28da Git: Factor out pattern for invalid branch names
Re-use it in the follow-up commit for remote names also.

Change-Id: Ib88792a1abdc2fa8ac23c99aa7d4861728e36eec
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-09 08:55:08 +00:00
Christian Stenger
93299cb802 AutoTest: Do not perform parse for disabled parsers
If a single parser triggers a reparse check if it is enabled
to avoid senseless work.

Change-Id: Ib28f2737be81021e1bfdd33eb347c64ffb5df020
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-09 08:35:47 +00:00