Commit Graph

43591 Commits

Author SHA1 Message Date
Eike Ziller
f7d8d97eb7 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ib2112c2fa3811ceb223f22f16b6da3e5a19793ce
2015-11-03 15:34:47 +01:00
Eike Ziller
2b074f5278 Packaging: Fix deployment for Qt5.6
Qt 5.6 builds with relative RPATH by default on Linux.
Since this additionally leads to very short RPATHs,
we cannot change the relative structure within the
Qt installation (e.g. plugins in bin/, libs somewhere
in lib/qtcreator/).
Instead we now deploy qt into a self-contained lib/Qt/
folder, keeping the original structure, on Linux.

Change-Id: I36136590379c3e7b02ba7de3345369e2384dcc95
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-03 14:16:15 +00:00
Leena Miettinen
aabd0202ca Doc: use include file for project creation instructions
Change-Id: I58f4a581de6273b16d2fc7ba07567527e46bc4d1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-03 14:10:05 +00:00
David Schulz
867fa1ff01 Editor: Fix potential crash in FunctionHintProposalWidget.
Task-number: QTCREATORBUG-15275
Change-Id: I8112312d3d27798665d7d28b41b9f2ad845cca14
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-03 12:17:45 +00:00
Eike Ziller
81e9b96148 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ic7cba72e7bec10e4fc0099b97e3317e391a6aa5d
2015-11-03 13:06:35 +01:00
hjk
62393af0ab Debugger: Remove comment regarding GDB/MI grammar
We have been way more generous in accepting input than what is specified
by the grammar since the beginning, and even GDB did (does?) not completely
stick to that format. So the comment is misleading at best.

Change-Id: Ieaf4fc2b9a6f01be649936f72e03866677d6cc5b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-03 11:36:26 +00:00
Tobias Hunger
406d231f1b Do not create a QFileInfo via Utils::FileName::toString()
Use Utils::FileName::toFileInfo() instead.

Change-Id: I63615b0e4ce1dd2e32d5f2b488710a55b8507d34
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-03 11:03:42 +00:00
Tobias Hunger
5d7f5a2a32 ProjectNode: Rename path() to filePath()
Change-Id: I78bb73f8c9457fd74c470eacbf54eb9195ac9681
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-03 11:01:50 +00:00
Ulf Hermann
ccc4fe54e5 QmlProfiler: Delete debug connection on error or if params change
Now that we don't recreate the debug connection anymore when (re)trying
to connect, we have to do it explicitly when changing the connection
parameters or when a connection attempt fails and we need to cancel the
"Connecting" state.

Change-Id: Ib2b6b4fb1e39e64fe3c9f2bf90b6e43043d05a9e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-03 10:44:56 +00:00
Tobias Hunger
6d9ff690c7 ToolChainManager: Use partition in ToolChainManager
Change-Id: I4a1376f1ed4ffea83bbd693b3bc1e8fd284771a7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-03 10:24:32 +00:00
Tobias Hunger
7d4078b963 Algorithm: Add partition functions
These take a container and a predicate and return a Partition
struct with the hit and miss fields. Any element in the original
container will end up in either hit or miss, depending on whether
the predicate returned true for the element or not.

Change-Id: Ia02cd704d6fe1388dc677308440acc48f7c9c1e1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-03 10:20:51 +00:00
hjk
b85d8290a7 Debugger: Restrict QJson{Array,Object} display to 1000 items.
... and don't offer expansion of isEmpty() object.

Task-number: QTCREATORBUG-15270
Change-Id: Ifb76c20c6308484d38e21273a2f33c575bb72430
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-03 09:55:52 +00:00
Leena Miettinen
95c7d6fed5 Doc: update the Transitions example to use UI forms
Move the instructions for creating the project into an
include file that can be used for all Qt Quick Application
tutorials.

Change-Id: I02385f68f23ef2d3ee98b754344781ae1819203c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-03 09:26:49 +00:00
Ulf Hermann
5babad8c38 QmlJS: Clean up QML console editor
Align the text between editing and display mode, and remove the dead
code. The prompt sign does not have to be part of the text and the
JS parser does not have to retain the code it parses.

Change-Id: I6e41f4fbc2cc863c84677640826d8663bcc648fb
Task-number: QTCREATORBUG-14931
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-03 08:50:51 +00:00
Ulf Hermann
19ab78865c QmlJS: Fix focus handling in QML/JS console
We want the line editor to be focused by default when the console is
opened either by mouse or by keyboard interaction.

Change-Id: Ic366d1ac5f1306c0739c334584568402969895f3
Task-number: QTCREATORBUG-14931
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-03 08:50:48 +00:00
Orgad Shaneh
d8d7acbe75 Git: Scroll to active file on Show invoked from file log
Change-Id: I0935bf8b8b30ee78716a14ee0a88c21b9caf62dc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-11-03 08:45:41 +00:00
Christian Kandeler
e2b8a1cb11 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: I1fe4823c46b0b28e1b9d7415e9d8fc3c4a7cea59
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2015-11-02 16:46:39 +00:00
Tobias Hunger
f735c8da45 GenericProject: Simplify project node
Change-Id: I74b0ab29457f384b63b396aec81655246b0e5e7b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-02 15:14:42 +00:00
Tobias Hunger
c251a22dc4 CMakeProject: Remove friend from CmakeProjectNode class
Change-Id: I562db9a1299f47f993517999070a99b12b26e04b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-02 15:14:21 +00:00
Marco Benelli
a8d1df2c0c QmlJs: fixed a regression in reformatter.
The commit b26920c3a3 introduced a bug
in reformatting properties lacking an object initializer.

Change-Id: I30f9c9c8a005660e7af4a6c97d0b1ff1be461548
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 14:26:40 +00:00
J-P Nurmi
7c1f8f8342 Add QML import completion for Qt.labs.controls, calendar & templates
Change-Id: I2aed529c3bedb27ae5c4c670d51d9d182815c8b2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-11-02 13:16:36 +00:00
Tobias Hunger
fb2a1fcb50 Python: Simplify project node
Change-Id: I21bf32612d10efce2ad8727637104f51013ae370
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-02 12:59:34 +00:00
Tobias Hunger
2ff1fe69a8 AutoTools: Simplify projectNode
Change-Id: I15c42a16b076cdb8ae78d54a665a4b7746a994e4
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-02 12:59:22 +00:00
hjk
3699f6cac3 Debugger: Remove spurious #include
Change-Id: I41a16aa5aa30369474b962213b39840f07080cc7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 11:27:04 +00:00
Eike Ziller
fe7fc8f816 Deployqt script: Stylistic changes
Pylint recommendations
- filter -> list comprehension
- whitespace fixes
- unused import
- unused variable
- variable overriding builtin
- missing exception types

Also simplify copy-ignore-helper

Change-Id: Ibf7c573af35d60937f23a85d7a52e20031f38c4b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-11-02 11:06:19 +00:00
Tobias Hunger
661f436e71 QmlProject: Simplify project node
Change-Id: I370fdb2e6bda67fb4ee5c77d736971460a28a68c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-11-02 10:32:37 +00:00
hjk
601f6fd819 Debugger: Rename GdbEngine::{stackListFrames->fetchStack}
Same as LLDB now.

Change-Id: I8a59a977fe45e7f523eae59cbb4cd24b78ad8e7b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 10:19:05 +00:00
hjk
d5101b5d91 Debugger: Standardize on all-lowercase for protocol options
CamelCase might be more Qt-ish, but the backends tend to use
lowercase only.

Change-Id: I04b9b7305b54226f27b70151115050c4816f911f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 10:18:50 +00:00
Ulf Hermann
b4e6591188 QmlProfiler: Convert connections to Qt5 style
Change-Id: I1a490add706cd0cfce3f243e4ebc32a8c9a975c7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-02 10:12:42 +00:00
hjk
1490bab5bd CPlusPlus: Remove used Lexer::translationUnit() function
Change-Id: I81ec60c1d2b670b85bfeda25e6388a12c2cd0305
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-02 10:01:09 +00:00
hjk
7a618c38cf Debugger: Remove unused dumper.py function polishWatcher()
Change-Id: Ib85ac34b56971b1882d91bddf9abf1af5b0506f4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 10:00:49 +00:00
Orgad Shaneh
4b8a14e10f DiffEditor: Remove "slots"
Change-Id: I31335ffd95e4e7955966d06c78bde166ad6d5555
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-11-02 09:22:11 +00:00
hjk
b1ad8b764d Debugger: Use some Qt5 connects
Change-Id: I03c301ae71c3747afc5d17a6f7689620e46fde62
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 08:54:07 +00:00
hjk
777b08f06d Debugger: Show "Automatically Hide View Title Bars" option only once
Task-number: QTCREATORBUG-15159
Change-Id: I0bd029c97a152887ad84181e551eb6a6b9bd764a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 08:52:28 +00:00
Orgad Shaneh
a1f2b8c76e VCS: Streamline output window
Use Core::OutputWindow instead of QPlainTextEdit

Change-Id: Ibad25b9ab1240d92977a0d789b440eaf3bc3e2a6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-31 16:46:14 +00:00
Eike Ziller
310ae09996 Merge remote-tracking branch 'origin/3.6'
Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
2015-10-30 16:08:03 +01:00
Jochen Becher
9fc4396e11 ModelEditor: catch all exceptions on loading/saving model files
As reported in QTCREATORBUG-15256 an invalid model file crashes QtC on
loading the file. Not all exceptions were caught.

Change-Id: Ie2e75ba23d92482e1365664f64728422e2003b32
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-30 15:02:42 +00:00
Tobias Hunger
88bbf4d126 ToolChains: Check typeId first before doing expensive checks
This should speed up toolchain auto-detection a lot.

Change-Id: Id732ed359a4c9de1d49cb658cc91c2e7c9d1b7a6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-30 14:35:37 +00:00
Jochen Becher
30cdff7129 ModelEditor: fix position of checkbox labels
In Properties view the checkbox labels were placed on the left side
(aligned with labels of other ui elements). With this change they are
placed in the usual way on the right side of the checkbox.

Change-Id: I2500249b18a7652d5d5a5c84b4d823ac97ecc070
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-30 14:19:52 +00:00
Orgad Shaneh
78ba92516d Gerrit: Index by number instead of Change-Id
Change-Id is not unique. It can be reused on several branches of the same
project, or across projects.

Change number is unique.

Change-Id: Id68ae63b4d745817a2cac764fdc8ceebdcb3faa4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-30 14:16:35 +00:00
Tobias Hunger
e60f62c131 ProjectNodes: Sprinkle override over the Node classes
Change-Id: I87db3a1b212aa0a3f140b8d299679f6c1f691004
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-30 13:35:53 +00:00
Christian Kandeler
155f033f92 QbsProjectManager: Add Qt resource files as nodes.
Like the QmakeProjectManager does.

Change-Id: I99c42dd93b87f7fce45e6af8a5f6802a2035ad93
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-30 13:23:30 +00:00
Ulf Hermann
ccb6d6131e QmlProfiler: Don't needlessly delete debug connections
If we're already trying to connect when the "Waiting for ..." message
arrives we don't want to start from scratch, but rather reuse the
existing connection.

Otherwise the handshake may be interrupted in an arbitrary state,
either leaving the remote QML engine waiting for the local QML profiler
to send the recording status, or prompting the local profiler client to
stop recording as the connection "broke".

The local QML profiler will only send the recording status if new QML
engines show up, which doesn't happen on the second successful
connection. That may be a different bug.

Change-Id: Ia17fcf9d0a28edf700274bcd88c2b7030220c290
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-10-30 12:47:58 +00:00
Tobias Hunger
66982fc12d Qmake: Remove some unused forward declarations
Change-Id: I739204c576aca11f565e9b159cd9a50388a515b8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-30 12:30:28 +00:00
Robert Loehning
9ca4648081 Squish: Replace white box code with GUI interaction
Change-Id: I513142498768dfb3f8373d00f0b04edba0dfd06f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-30 10:46:53 +00:00
Robert Loehning
e94de191b0 Squish: Update objects of Qt version settings
Change-Id: I2fce4d860a70230519d7f56e58d88a03dbb379ba
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-30 10:46:24 +00:00
Alessandro Portale
d7d4c2b629 FancyTabWidget: Remove qDebug()
...ouch...

Change-Id: I66b101771d419b8fe1a37a13d0b7100552dcb05a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-30 10:19:03 +00:00
Marco Benelli
b26920c3a3 Fixed bug in reformatting QML code (duplicated property name).
Change-Id: I1af68aa979fbbc38edd0255c346b9df371c8fd26
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-10-30 10:03:36 +00:00
Eike Ziller
411c79a599 Version bump and use binary artifacts 3.6
Change-Id: I57f643b0400c945f2bfe3513ef23a9eccc083100
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-30 08:44:36 +00:00
Orgad Shaneh
15a9ad92ec VCS: Support searching in VCS output pane
Change-Id: I88312b2585636aa89b2657800fc2254e83dc9c00
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-30 08:43:00 +00:00