Commit Graph

32682 Commits

Author SHA1 Message Date
Eike Ziller 49b7e95e7f Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
2013-11-06 14:02:08 +01:00
Kai Koehne fbd3f73594 QmlProject: Update code model if kit configuration changes
Update code model if e.g. the Qt version in the active kit changes.

Task-number: QTCREATORBUG-10656
Change-Id: I4263833c23c2b00035d15faa9725adbb734f8366
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-06 13:17:15 +01:00
Fawzi Mohamed b4785dde11 ios: codestyle fix
Change-Id: I276e382f98f2851c489e8c5b5a682f7a57e80c7f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-06 12:57:41 +01:00
Fawzi Mohamed d882b22598 ios: remove left over debug message
Change-Id: I7b4c0a15f7f74ad346bf05b7974270fccd2e0c07
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-06 12:55:53 +01:00
Daniel Teske f85c200244 New File/Project Dialog: Don't use &c twice
I'm not sure how the cancel button gets that accelerator, but the
default button should not have a accelarator anyway.

Task-number: QTCREATORBUG-10608
Change-Id: I18899bfa039a82f0cbb2cf6ae0ed21a9f0e619d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-06 12:55:52 +01:00
Leena Miettinen f7b1dbe92c Doc: point the automatic links to Qt 5 docs
The index files are now fetched from qt5/qtbase/doc.
Removed the qt.index file that came from Q 4.
When building the docs with Qt 4, no links will
be generated automatically.

Change-Id: I0786745f218e4c854e08012664629a7697dcadf3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-06 12:32:03 +01:00
Daniel Teske 56a7ae72d3 Introduces a crash. m_baseLayout is not the same in the ctor and ::initializePage
This reverts commit 9ce63df00e0c06388a7cdcc90d1dc30d39bbbad4

Change-Id: I1291e8460a56187893c342e6f1beef7be57767a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-06 12:09:02 +01:00
Christian Kandeler 496020c5c0 Update qbs submodule.
Change-Id: Iee1d7b6db6988e36aec44acb164c891c6b0763d9
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-11-06 11:53:03 +01:00
Leena Miettinen 8e81367ca6 Doc: remove the Publishing topic
Qt Creator does not have publishing wizards anymore.
Left a short description in the IDE Overview topic and
removed all other information and links.

Change-Id: I3c49648779a19036d200e1dec4f46116197c18e7
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-11-06 11:46:28 +01:00
Ulf Hermann 5eb057c7e2 Optimize TimelineRenderer to not paint invisible items
Check the dimensions of the window being painted to before actually
painting the events and skip invisible ones.

Some primitive profiling using QTime shows that the average time taken
per event in TimelineRenderer::paint() is approximately halved by this
patch when profiling the QML widget gallery example and expanding all
categories in the timeline.

drawSelectionBoxes() is not optimized because the number of selection
boxes is expected to be so small that the overhead of the check might
outweigh the performance gains of skipping events.

Task-number: QTCREATORBUG-9982
Change-Id: I42e533c11e3a17f9d63b61ce5e4192c8f40e1be9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-06 11:46:00 +01:00
Friedemann Kleint 526037da33 Remove leading blanks from messages.
Change-Id: I688867fcd81511f4b8c9a02cf5a36e0a32a8980d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-06 11:22:14 +01:00
Eike Ziller fd8fee749e LLDB: Fix Qt4/QSet dumper
Change-Id: I90d3e81653266f660c27f14093459a84873b6dd3
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-06 10:32:18 +01:00
Eike Ziller bad7b17267 LLDB: fix QHashIterator dumper for Qt4
Change-Id: I6743839cc54f81eb17125f2449dd1df391b9a1a4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-06 10:31:45 +01:00
Eike Ziller ff3b32ac83 Version bump
Change-Id: Id68423b08a6f7e0d295e7b065d7c50d25f914541
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-06 10:24:29 +01:00
jkobus 62590507b1 Merge multi Qt Quick UI wizards into one
Change-Id: Ia984c36864dacd5b71c76976a351767bb4c3693c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-06 10:23:49 +01:00
jkobus 6313b2ca4b Show only those kits that match selected component set
Change-Id: Ic5aa0bc17bc1cd3ce153c28f75233843d9b5944d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-06 10:00:12 +01:00
Friedemann Kleint 2111e986fa Use LLDB in messages.
Change-Id: I66bcd9ecad81307b1d6a015003500836e58e4e83
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-06 09:36:32 +01:00
hjk 949fb733ee Debugger: Split memory reads if big reads fail
Task-number: QTCREATORBUG-10396
Change-Id: I2083e493329fa287446f3c48b4ef8d08fadd9827
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-06 09:18:25 +01:00
Fawzi Mohamed bd685bdec5 iostool: set more env variables (to improve app environment)
Change-Id: I97443b7a4e96bc176a38d08d415bd4d27ae6268d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-05 19:28:01 +01:00
Daniel Teske 0779cec29b TargetSetupPage: Move code to ctor
::initializePage() is called multiple times, so those should be done
in the ctor

Task-number: QTCREATORBUG-10643
Change-Id: Ic684bfc6f4352c39d42789abab1c29b6402185d0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-05 19:05:09 +01:00
Daniel Teske ca66080254 BuildManager: Don't count disabled steps in progress
QFuture limits the signals that are emitted for progress. A disabled
step takes so little time that its progress information is lost.
Since technically a disabled step never finishes, counting them in the
progress was dubious anyway.

Task-number: QTCREATORBUG-10606
Change-Id: I1860c65242282e8e2890f4977c487a6e6dcfbf2d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-05 17:40:00 +01:00
David Schulz 94c10ae6cc Debugger: Interrupt inferior via signal operation on Windows.
Task-number: QTCREATORBUG-10558

Change-Id: I5a27beca4601cae3b0de8f903a2cbc08ee801149
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 17:07:30 +01:00
Fawzi Mohamed 9a4caa4b4c ios: improve automatic kits
* fix incorrect old kits
* avoid adding a special debugger

Change-Id: I233068dbb9958045cdc2e875337297748b2b4ff8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-05 17:00:33 +01:00
Fawzi Mohamed 242cba3065 ios: better error messages
Change-Id: I2ccb7655320b18eed9f10c8b6130befe8c9cbdb0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-05 16:59:09 +01:00
David Schulz 7243def78c Android: Add AndroidSignalOperation.
Allows to kill and interrupt remote processes with the pid.

Change-Id: I22befc04dafbe2a7f132bddb3e17a2b48579ef3c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 16:55:29 +01:00
Fawzi Mohamed 95436113ad gcctoolchain: improve architecture detection on mac
Change-Id: If6346fdf7d159891513764ada6fb4c1fcc9c4a63
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-05 16:51:55 +01:00
Daniel Teske 5ff8bac3c6 Analyzer: Fix scrolling
Broken by qtbase commit 934f06220391eb0e0ebf66a2eb037f48adb4c43c

Change-Id: Ib58aa6ff31b7ce81bfa26e1ccf1bbf209618b307
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 16:19:23 +01:00
Kai Koehne cecc46b940 Replace QString::fromLocal8Bit("") calls
Calling fromLocal8Bit() for literals is wrong, since that depends
ont the user's environment. We use latin1 strings exclusively in Qt.

Change-Id: I0cd0986787ea630425773672d3a892fbd0f0a77a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 15:27:25 +01:00
Kai Koehne 0d3314d922 EditorManager: Let instance() method return specific type
Returning a generic QWidget* here was introduced to prevent people
from accidentally using static methods via instance()-> . Anyhow,
it also breaks code completions for signals and slots.

Change-Id: I2933d5686c1a7e325c6c08c376fbe65ca657c365
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-05 15:16:46 +01:00
hjk 98a17c8c20 QmlDesigner: Squash warning and undefined behavior
Change-Id: I84434ee52110d4a4d452c0343e1bfce570887976
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 15:13:27 +01:00
hjk f98220bf31 QmlDesigner: Compile fix
Change-Id: I0d8e37253f472270b8efbc433dc2664f28a2b6b4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
2013-11-05 15:13:18 +01:00
Kai Koehne fbe855126b QmlProject: Update current file name if file gets renamed
Task-number: QTCREATORBUG-10630
Change-Id: I7901b1204a389e6b9349e059186d0e89f7437740
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-05 14:54:03 +01:00
jkobus 686e523f29 Removed unused ui file
Change-Id: Idb9e39ff155ff7dd36f490983ae978681e47fb18
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 14:46:35 +01:00
Thomas Hartmann 18584e9546 QmlDesigner.GradientModel: lock the model
Avoiding unwanted changes.

Change-Id: Ifafa9cc76101c8b9eb877a718db050d0eb6456f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 14:36:46 +01:00
Thomas Hartmann f1c82581b4 QmlDesigner.PropertyEditor: some cleanup
Change-Id: I1805474d2c0f05b4662783972e1eb77e6097bf3b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 14:36:33 +01:00
Leena Miettinen 4e6918e179 Doc: changes in Qt Quick project wizards
The Qt Quick application wizards were combined into
one wizard and the wizard for importing existing QML
projects was removed.

Change-Id: I2761c0065541a54bb3efe970ed9481352adc9fec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-05 14:13:58 +01:00
Friedemann Kleint 547d67da7d Remove trailing blanks from messages.
These causing warnings when applying translation patches.

Change-Id: Id260369ac59b4218bf5b8391eb547aec58ffd3f5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 14:10:45 +01:00
Thomas Hartmann 17ac05068e QmlDesigner.Naviagor: crash fix for slides in model
For some reason gradient stops end up in the navigator model.
This should be fixed for 3.1.

Change-Id: Ic447a6907409e4e9776cfd164a49bb6194cc4cab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 13:47:41 +01:00
Thomas Hartmann 1750cdc182 QmlDesigner.PropertyEditor: using GradientModel in QML
Change-Id: I939fe8952e12f20d4a4ca6d6a41ee578cee0f7b5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 13:45:57 +01:00
Thomas Hartmann fec1187e08 QmlDesigner.PropertyEditor: Adding GradientModel
Change-Id: Ifeb9aeb8515a91f57a0d532fb3c0e32650e4f403
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 13:45:48 +01:00
Thomas Hartmann 618512ac8c QmlDesigner.PropertyEditor: style HueSlider
Change-Id: Iec7483006ca91482c7f9a6a81dc742294e78ad1f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 13:43:22 +01:00
Thomas Hartmann 8a4fcad985 QmlDesigenr.PropertyEditor: fixing styling of binding editor
Change-Id: Ia0ee9345a5cc1a8b5a9f9208306d91edb47ace35
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 13:42:40 +01:00
Thomas Hartmann 82a54c2864 QmlDesigner.Button: using Constants.js
Change-Id: I0715d9a377493ffb383edf9f28ec1725191e5efb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-05 13:42:29 +01:00
hjk a57ab5d44e Debugger: Distinguish stdout and stderr in LLDB
At least theoretically, on our side. Practically the output
seems to arrive all with ldb.SBProcess.eBroadcastBitSTDOUT
from LLDB.

Change-Id: I61cfb1e01193c57e06aebeaa8defa11809e24c50
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-05 12:52:23 +01:00
hjk 53e8991600 Debugger: Remove unused code
Change-Id: I139a38c6646c3c19819e2c122d7f8be285eae09e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 12:37:10 +01:00
Eike Ziller 287da2627d dumpers: enable backtraces for tests
Change-Id: I80bfb459c20e92fb0ea4e938421015a09f1c8518
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 12:35:21 +01:00
Ulf Hermann ac7fe92efe Remove disconnectClientSignals() from ~QmlProfilerClientManager()
disconnectClientSignals only disconnects signals of objects that are
deleted directly afterwards. As deleting a QObject automatically
disconnects its signals it's unnecessary to explicitly do that before.

However, if QmlProfilerClientManager is deleted from the destructor of
QmlProfilerTool, receivers of those signals may have already been
deleted. This can lead to crashes.

Task-number: QTCREATORBUG-10634
Change-Id: I1e5ce7a6ac4b331fa423987e3a8faa3584b991d2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-05 12:24:56 +01:00
Orgad Shaneh 6bdb402f31 Git: Prefer first match on Push to Gerrit with detached head
Following matches are likely to be merges, and not the branch that the
first commit originated from.

Change-Id: I80a442bf9f7bc7f5859a1f4c3d3e167d55b28241
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-11-05 11:57:07 +01:00
hjk e2d258842e Remove GDB patches
The remaining patches are currently not actively used, and unlikely
to be used again in the future.

Change-Id: Ie2cc47d5076f5e28b8182c0ff06621f576c81d34
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
2013-11-05 11:46:13 +01:00
Aurindam Jana d349010445 QmlProfiler: Rename Label to CategoryLabel
This is to avoid confusion with generic Label
Quick component.

Change-Id: I6a72266c394862706215b6db40bcd3592f9d24b3
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-05 11:39:58 +01:00