Commit Graph

44349 Commits

Author SHA1 Message Date
Jarek Kobus
ca71939b15 Use one common EnvironmentDialog in 3 different places.
Reduce code repetition.

Change-Id: I7442c035270a18c79afd82c2111d363fd840df96
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-17 08:47:48 +00:00
hjk
fb482846fc TreeModel: Add a StaticTreeItem(QString) convenience constructor
Covers the common case and hopefully avoids the recurring MSVC
problem with initializer lists in this location.

Change-Id: I1b2bbb083f9fc86af3b51b8f52615fb70c832b95
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-17 08:09:48 +00:00
Eike Ziller
9a8043d9ce Merge "Merge remote-tracking branch 'origin/4.0'" 2016-06-17 07:49:19 +00:00
Christian Stenger
c61fdf99ce AutoTest: Fix run selected for gtests
Change-Id: Ia6f7a4b9b5c1bb359e75d11255246e971fd1f9d2
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-17 07:11:03 +00:00
Christian Stenger
e10189efb3 AutoTest: Fix extraction of failure location
It seems the failure location output is slightly different when
using an MSVC compiler.

Change-Id: I8f07debac505a0429f4ea1644d076ffcc3304f25
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-17 04:59:28 +00:00
Christian Stenger
d7dc7159b2 AutoTest: Filter out test case summary as well
If results are filtered and the filtering results in omitting
all entries of a test case filter out the test case as well.

Change-Id: Icd3b18566ed45a68b2ee630a2f13be80257f6b26
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-17 04:58:52 +00:00
Eike Ziller
2734b20774 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie054857189601ef6ec43623d54a8aee4111a72c5
2016-06-16 15:20:55 +02:00
hjk
adaa35aaa5 QtSupport: Elide in middle of option page texts
Not eliding makes long qmake paths nasty to ready. It was intentionally
introduced to fix QTCREATORBUG-4893, but overall ElideMiddle appears
usable to me.

Change-Id: I6882e802f5ea8ca222056e4bdcd7870023889d7d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-16 09:26:30 +00:00
hjk
7d95124736 ProjectExplorer: Remove unused m_panelFactories member
Change-Id: I4ac30f7f7a1ca604b7ed2bbd734f50f5b5865913
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-16 09:06:10 +00:00
Thomas Hartmann
62acb38d56 QmlDesigner: Adding support for Controls 2 styles
The environment variable used for styling is the same as for
Controls 1.0.

I added a combo box that allows to easliy choose the styles shipped by us:
Default, Material and Universal.

I also set the environment variable for labs Controls so this can be used
with Qt 5.6.

Change-Id: I73a4dd2b4132175638c99cf9be65f1ab1b7e6d8e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-16 08:39:59 +00:00
hjk
4a74b6184f Debugger: Don't interpret rich text in Separate Window
Task-number: QTCREATORBUG-16444
Change-Id: I5c7a0c307d485575e4c180fad026150417481c24
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-16 08:13:37 +00:00
hjk
6e3fc27fd8 Debugger: Fix display in separate Window
TreeModel::forAllChildren and TreeModel::walkTree differ
in the handling of the topmost item.

Change-Id: Id2032f69bb47218292507d33ed00935874afa73f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-16 07:34:27 +00:00
Orgad Shaneh
f81070a852 ProjectExplorer: Fix broken connections
Broken by 0bf7893415.

Change-Id: Ic9843c87cad55caa48b692f32d47e3c60c45787d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-15 15:45:32 +00:00
Orgad Shaneh
35036110ce SSH: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I04261849c92c54990f9f142fe541d984c5fb21d3
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-15 14:50:56 +00:00
Alessandro Portale
4cb94be1b5 Core: New "Replace" icon
HighDPI capable and themable.

Change-Id: I12b598a081f2ed30dd31b138fd605e71b6f28c20
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-15 13:35:22 +00:00
Christian Stenger
4d1918c93f AutoTest: Remove indirection when retrieving configuration
Change-Id: Ia77dd1880da9b4b8d83456af231fe32724427552
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-15 13:22:52 +00:00
Christian Kandeler
a0cceb2810 qbs build: Do not make the ProParser a static library after all.
If ProParser is a library, all plugins depending on it (to be able to
get at the include paths) will also link to it, but there must be only
one instance of its data present. So we go back to building the sources
as part of the QtSupport plugin, while the ProParser product is now only
responsible for exporting the necessary defines and include paths.

Change-Id: I9ad62343064d8aea8ddc4776a462308c4d6ae283
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-06-15 12:36:43 +00:00
Christian Kandeler
e1e203598d qbs build: Final steps to support building plugins "out of source".
- Use the entire Export block when creating a module, not just the
  Depends items. Adapt references to the product source directory
  and the "share" directory so that they point to the respective
  locations in the install tree.
- Install dev headers for some more plugins.
- Bug fixes & polishing.

Create a "dev installation" like this:
$ qbs qtc.make_dev_package:true qbs.installRoot:<install root>

Then build your plugin against it like this:
$ qbs qtc.make_dev_package:true qbs.installRoot:<install root>
project.qbsSearchPaths:<install root>/qbs-resources
(Using qbs from 1.5 branch; 1.5.1 requires a trivial wrapper project.)

That's all. Successfully tested with all commercial plugins on Linux.

Change-Id: Ie39c4717dafcd431c533421a15f2f898783d8521
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-06-15 12:35:55 +00:00
Tim Jenssen
96a3d49b07 msvc2013 can not handle 1 item initializer lists
Change-Id: I44b3c3888f15a6b68ddaed2777b90cf4057792b1
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-15 10:55:46 +00:00
hjk
2ee9ee9bff QtSupport: Make changed Qt version names bold in version dialog
Mimic what other Build&Run views do.

Change-Id: I6abb13816b5fe17f9aeeb38b0041c1f9b11a98ec
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-15 10:20:38 +00:00
hjk
d5de457787 QtSupport: Use a LeveledTreeModel in option page
Less code, less casting.

Change-Id: I44400914d722211612562c47286ac4d7fc5511b7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-15 10:19:37 +00:00
hjk
b281d6dad7 TreeModel: Introduce a StaticTreeItem
This splits out the case of static string displays from the
TreeItem base class, making the base more lightweight.

Change-Id: If1f442011ec60094399a41b65d9b5015f432f82e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-15 08:55:16 +00:00
hjk
0c1cdc3a4a Decorate root items in debugger and cmake options pages
More consistent with Kits, Qt versions and Compilers.

Change-Id: I16bb497a9fb17f271ffbf89e746d478b3aecb6a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-15 08:41:30 +00:00
Tobias Hunger
069bb2d359 CMake: Work around cmake reporting include paths in random order
Work around cmake reporting include paths in random order to Qt Creator
due to a bug in the CodeBlocks generator.

Remove the tool chains include paths from the list reported by cmake and
have the code model add those again later. That keeps at least the
include paths of the compiler in order, which is important as this
makes sure any fixed headers shipped with the compiler actually get
picked up.

Task-number: QTCREATORBUG-16432
Change-Id: I218735914bcc750ce87b02b05d111f3fe2bb5644
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-15 08:11:40 +00:00
Orgad Shaneh
c74a366df3 Nim: Cleanup includes and qbs dependencies
Change-Id: I1b6ef9d875a2b0c440e52148340337a3e3c25477
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-15 07:58:51 +00:00
Tobias Hunger
d76ba21aed QMake: Warn if build directory and source directory are not on the same level
We used to warn about this before, but users contributed patches that got
merged that removed these warnings for qmake versions where this bug is
fixed (QTCREATORBUG-10024).

Oswald says this to the topic:
"it's possible that *some* related problems were fixed (i remember for a fact
that i tried), but the fundamental underlying reason is inherent in
fileFixify(). fixing it basically means rewriting half of qmake, which simply
isn't going to happen at this point."

Task-number: QTCREATORBUG-16430
Change-Id: I78535273adacd40895e5bf203a2ea17dcc81716d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 15:54:49 +00:00
Thomas Hartmann
12aa10158a QmlDesigner: Normalize expressions
We have to remove whitespaces and ';' to normalize expressions.
Otherwise expressions can change when rewriting.

Change-Id: I0085a5a46c4caa2815a4e7f4f76658a4df49de75
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-14 14:42:46 +00:00
Christian Stenger
584e0c6b4c AutoTest: Display hint if no framework is active
Change-Id: Ia569bcb5c78809cd9bc58499b55b1b26e34d5d89
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-06-14 13:46:36 +00:00
Tim Jenssen
e17d09a83a QmlDesigner: fix that we get output only in error case
Also compress output in three lines

Change-Id: I5a6917f4243f05ff58692ffdb3b17412b49fdeb9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-14 13:15:52 +00:00
David Schulz
c7b7e4d761 Editor: Use cursor instead of position for animations.
The cursor position is adjusted when the content of the editor changes
during the animation.

Change-Id: I6792841aca4babd6969a268c5b7cc318d7d4d4b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-14 12:31:09 +00:00
Orgad Shaneh
9ed97cb732 QmakePM: Fix support for custom Makefile names
Task-number: QTCREATORBUG-16431
Change-Id: Ice2b18114c0d71e0a09ee63cd37559eb28b42034
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 12:24:25 +00:00
Christian Stenger
54cb7fef04 AutoTest: Delete framework if it cannot get registered
Change-Id: Ib55cb2cced5eefbb44f554994e0e9cd9a8ea24f7
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-14 11:13:19 +00:00
Christian Stenger
8cba580343 AutoTest: Introduce active state for test frameworks
Change-Id: I0fddce91a239c0a51352a25e34a221fd8880b733
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-06-14 11:05:35 +00:00
Tobias Hunger
c64fa0d329 SessionManager: Simplify code
Change-Id: I97755d07f5d37452e01f6e687f1790dee33bb48e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 09:19:12 +00:00
Tobias Hunger
4d617c8102 Session: Remove addProjects(...) method
It is unused. Also remove singleProjectAdded signal, and replace
the only use with the projectAdded signal.

The singleProjectAdded signal was emitted for each project that was
ever added, simply because nobody ever used addProjects(...) with
more than one project.

Change-Id: I5aee315c64a2cfb721471d580989a6a02d44fefc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 09:06:57 +00:00
Ralf Nolden
9b4c91cacc qmake ABI detection fix for NetBSD and OpenBSD
The ABI dection works on inspecting the ELF header which should contain
the values for ELFOSABI, with the macro ELFOSABI_NETBSD equals 2 and
ELFOSABI_OPENBSD equals 12. However, on these systems the ELF binaries
are built using 0 so detection will fail and default to Linux, preventing
to use the correct qmake for Desktop Qt. Therefore, on these systems default 0
to use the host OS (NetBSD or OpenBSD), otherwise Linux as before.

Change-Id: I293389980860977ba6c2ad9903edd567f0a5b9f0
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 09:00:07 +00:00
Christian Stenger
a5a6206e92 QmlProfiler: Disable a plugin unit test on Windows
This test does start QC with '-version' which results in a (blocking)
dialog on Windows.

Change-Id: I75fc84382bf7228f17febe4b852db01362b02537
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-14 08:48:47 +00:00
Thomas Hartmann
7e7246bd25 QmlJS: Do not rely on Qt Creator plugins running
This is not the case in some tests.

Change-Id: I531997bc6eb0b9cb8057b7e488bca1c301c88add
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-06-14 08:02:06 +00:00
Orgad Shaneh
3f879c0c79 Git: Use correct line numbers in limited range blame
Change-Id: I12f6fc77b532e5b01f2da6c1c1ff847445447c70
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 07:57:03 +00:00
Orgad Shaneh
3845c833fc VCS: Return the editor in VcsBaseClient::annotate
Will be used in a follow-up commit for setting base line number
for limited range blame.

Change-Id: Ibae90f3ac982ebe9f53aa282f70c2c703e9eeb9d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 07:56:55 +00:00
hjk
779f172581 Debugger: Add a message box with a hint to fix missing executables
Change-Id: Ie193a88cdc58f6f6e09178c601a227cc17bf10de
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-14 06:26:03 +00:00
hjk
1284e95295 Debugger: Fix QByteArray/QString overload mixup
And take the opportunity to sprinkle more 'override' over the code.

Change-Id: I8b6b80653ca671e7681b7de2de5ad4288b281ccf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-14 06:25:50 +00:00
hjk
78a800cb34 Debugger: Use dedicated structure for Qml server parameters
The main idea is to start using ProjectExplorer::Connection later.

Change-Id: Ie91eacdfb0e93ae142fec7ce32bcf554a5282122
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-14 06:25:34 +00:00
hjk
7e8d9835f7 Debugger: Do not pass inferior output unncessarily through MI parser
Change-Id: I809c6bf9cd1b97a728af341819b3f009335ffa36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-14 05:43:43 +00:00
Christian Kandeler
85f6314140 qbs build: Fix ProParser dependency.
The dependency is introduced by the QtSupport plugin, not by
QmakeProjectManager.

Change-Id: Id24b3010fd816162cb839d4a35ab97303eca7a9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-13 13:39:23 +00:00
Christian Kandeler
7e6bbfe168 qbs build: Export relevant include paths from QmlDesigner product.
Change-Id: I79dc9a02cd5d2450ee733dc83d5dc8f103783b15
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-13 13:37:22 +00:00
Eike Ziller
92e352f4f0 EditorManager: Auto-suspend editors
Adds an option (enabled by default) to close older documents when
opening new documents. These documents are put into "suspended" state,
similar to when restoring sessions: They editors and document are
removed, freeing the memory from their content and attached resources
(e.g. code model resources), but keeping the entry in the open editor
list (and history list, of course).
This is limited to editor/document types that can restore their UI state
when the document is reopened.

Task-number: QTCREATORBUG-10016
Change-Id: Icb5595aec950e3f666d42177fe2fd233954f2772
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-06-13 12:56:12 +00:00
Tobias Hunger
98192159da Revert "QmlDesigner: Use generic signaling from project"
The code that this depends on is not there yet.

This reverts commit e6f0695751.

Change-Id: I61d4ff735342731a781960b19b047613b58a23b5
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-13 12:42:22 +00:00
Tobias Hunger
e6f0695751 QmlDesigner: Use generic signaling from project
Change-Id: I135ffcbff3651fe7ff7bc1525881f805a820fb10
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-13 11:21:20 +00:00
Tobias Hunger
8213a25102 Fix compile fail due to class/struct mismatch
Change-Id: Iac88272a968a202cbbc97b58df7dff7d48e62672
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-13 09:37:08 +00:00