Commit Graph

34728 Commits

Author SHA1 Message Date
Orgad Shaneh
2f8ca8f81a VCS: Prevent checkout/clone over an existing non-empty directory
Task-number: QTCREATORBUG-11701
Change-Id: Iee87deec59a8abed8930096c53e3c3514a208486
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 11:39:31 +01:00
David Kaspar
0aabacb7b5 ProjectExplorer: SysRoot config widget is read-only when sticky/not-mutable
Change-Id: I39a04cc76896674e8df743cdc85a9f09c4857907
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 11:27:43 +01:00
El Mehdi Fekari
0afe611e93 Kit: Save sticky kit information
Task-number: QTCREATORBUG-10485

Change-Id: I02081a45ce789992f22f79dc0fc3a60fe7ce439f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 11:27:32 +01:00
Erik Verbruggen
ae24a88e90 Clang: never include a define for __cplusplus.
The flags used by the project explorer to interrogate the toolchain for
compiler-defined #defines always indicate a C++ file. So, this will
always include a #define for __cplusplus. When editing C code with
the clang code model, this results in extern "C" linkage specifications,
which result in warnings or errors.

The proper fix is described in QTCREATORBUG-11709, but is too big to be
done within the 3.1 timeframe.

Task-number: QTCREATORBUG-11501
Change-Id: Id9e261fa8d429fead4a2cd5fd7398aa6e1e8c13d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-03-18 11:08:20 +01:00
hjk
6206dc8b64 Debugger: Be more verbose about unhandled breakpoints
Especially for mixed debugging getting the ID explicitly
gives hints which part of the combined engine fails.

Change-Id: Iab4b54d6e9fb8d4afd3df0855861511bc06454c1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-18 10:34:38 +01:00
hjk
5d1bc3859d Debugger: Add simple QV4::String dumper
Change-Id: Ide277128d30c4dcc5c396441ebd6e40aa3fc8b51
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-03-18 10:32:31 +01:00
Lorenz Haas
b950c8c164 Beautifier: Small, paranoid local caching in the hope for gaining speed
Avoid that QDir::home() is potentially called twice.

Change-Id: I9fca53f800be74f05d941cf9baa34eecb6c899cb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-03-18 07:34:35 +01:00
Robert Loehning
991e1bfa0a VCS: Fix message in GitClient
Change-Id: I1184b15a8b225430b59e0abb35cd9395cb7d1850
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-17 21:12:36 +01:00
Robert Loehning
42dddc1110 Fix tooltip
The button actually reads "Do Not Show Again".

Change-Id: I9e8599d26f1fe4ce73af739833dcec1ed8cc9a07
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-17 19:24:35 +01:00
Thomas Hartmann
df4a28dd40 QmlDesigner.PropertyEdior: Fixing ComboBox
If there is no enum value fall back to the instanced value.

Change-Id: Idd4654d6e9fb8d4afd3df0855861511bc06454c1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 17:38:59 +01:00
Thomas Hartmann
af906188cd QmlDesigner.PropertyEditor: Fix OriginControl
The control has to use the new enum api.

Change-Id: I73e86ac1c4f2c3fe4373b12968ac86fbbaee64aa
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 17:38:55 +01:00
Thomas Hartmann
ff5c964457 QmlDesigner.PropertyEditor: Fix text alignment buttons
They have to use the new enum api.

Change-Id: Ib4ac7d56512007cb19fd7e6a65413198a9d90719
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 17:38:44 +01:00
El Mehdi Fekari
71510a8d41 Qnx: Use correct mkspec in the qmake step
In order to use the correct mkspec in the qmake step,
the qt version mkspec needs to be explicitly listed in the QnxToolChain
suggested mkspec list (Otherwise the first one found in
list will be used).

That is currently broken due to the following issues:

* The mkspec for BB armle-v7 target has been recently
changed to blackberry-armle-v7-qcc, which was not listed
in the QnxToolChain suggested mkspec list.

* The Qt4 for BB armle-v7 uses the "default" mkspec which is a copy
of the "blackberry-armv7le-qcc" mkspec. The mkspec
name should be explicit in order to be found and used.

Task-number: QTCREATORBUG-11674

Change-Id: Idb53d22e7c4b746b23dd3a65c42d00dca5c27d0c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-03-17 17:05:41 +01:00
Robert Loehning
9d97880037 Squish: Trying to stabilize tst_CSUP04 on Mac
Looking at the screenshots, fails might be timing issues.

Change-Id: Ia17b766e332370b3392161d79c774d94f3c1b790
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-17 16:22:20 +01:00
Thomas Hartmann
8d563e7b8d QmlDesigner: Revert bumping the puppet version
Since Qt Creator 3.1 will be released before Qt 5.3,
bumping the version number and enforcing to rebuild the puppet
creates a huge hurdle for end users.

Change-Id: Ic85a2ed315cf67b7d47bdfa492e6c5d2adf719d9
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 15:23:20 +01:00
Thomas Hartmann
de7d2d7aa3 QmlDesigner: Hotfix for older puppets
Older puppets crashes if we send enumerations so we convert them before.
This patch has to be reverted in master.

Change-Id: Id33e776616ea6e74c7b14799e3aed130c39f8fed
Hotfix: 3.1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-17 15:23:13 +01:00
Ulf Hermann
71da9c4ac8 QmlProfiler: Save/Load thread ids in trace files
Without this, a trace will change if you save and then reload it.

Change-Id: I78bc6c58df2eb79305c069a5e45f62f9bf58c4ce
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-17 15:03:38 +01:00
Topi Reinio
627e2b4807 Doc: Use the page title for linking to index.html
Because the Qt Creator documentation depends on Qt reference
docs for linking, qdoc will generate a collision page for
index.html as it exists in both.

This change prevents linking to the collision page in the
navigation links by using the page title as the link target
instead of the file name.

Task-number: QTCREATORBUG-11035
Change-Id: I5638e09b60543dc2068b0e4a269f8f72d4655b48
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-17 14:53:01 +01:00
Nikolai Kosjar
332caf38be Clang: Print cmd line equivalent if using QTC_CLANG_VERBOSE
...so we can easily check if the bug is in (lib)clang itself.

Change-Id: Id6dfd8014efc1c7704265b99697f19ab990286a7
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-17 14:48:33 +01:00
Nikolai Kosjar
cbf98ba819 CppEditor: Allow force highlighting if using clang
...so we can rehighlight if it's requested by the editor. This is e.g.
necessary if the font size changes.

Task-number: QTCREATORBUG-11502
Change-Id: I608921899fc37fcf1394db9ff041e6b378196bdd
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-17 14:39:50 +01:00
Nikolai Kosjar
18e6be55d7 CppTools: Tag incomplete semantic info
...in order to be able to full-rehighlight on the next turn.

The following sequence was problematic:

1. recalculateSemanticInfoDetached(true)
   * e.g. triggered by opening the document
2. recalculateSemanticInfoDetached(false)
   * e.g. triggered by moving the cursor
   * cancels 1. and leads to incompletely parsed/checked document - OK
3. startHighlighting()
   * triggered by 1.; starts highlighting on incomplete document - OK
4. startHighlighting()
   * gets a completely parsed/checked document - OK
   * not forced, so just compare revisions; they are the same, so
     skip/return - a partly highlighted document is left behind.

Task-number: QTCREATORBUG-11367
Change-Id: Ic56e00e862ec4a1ffa197b2fc8b48be56a3562de
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-17 14:39:19 +01:00
Nikolai Kosjar
1f0fd959fa CppEditor: Do not cancel highlighter on user interaction
e.g. changing cursor position or editing text.

CPPEditorWidget::updateUses() does not depend on the highlighter, but
only on the semantic info update.

Task-number: QTCREATORBUG-11367
Change-Id: Ia9f5ed7c2adc6899995a5d966a20e45b2f87d9e3
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-17 14:38:32 +01:00
Robert Loehning
823fafc17e Squish: Improve verification of git clone log
Change-Id: I7f1ae5f9b483a97266358d71c545b157e743e853
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-17 14:15:47 +01:00
Ulf Hermann
08eaa92085 QmlProfiler: Fix logic when timeout-connecting to QML port
The timeout signal doesn't contain the QML port but we might know it if
we've explicitly set it. The previous logic makes no sense at all.

Change-Id: I820255e492e919ee916a5f859d7809a6c5233399
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-17 14:12:21 +01:00
Kai Koehne
e2ac45bf7e Remove script-private dependency from qml2puppet
Change-Id: If040844310105970f645f413cfc005abdb95994c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-17 13:09:12 +01:00
Ulf Hermann
2fac0c5fbc Android: Try to parse the QML port from stderr
Most of the time the port is not announced on stdout but on stderr.

Change-Id: If72bb7f65dcfe7e697de2545d33e99ddb6363ecf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-17 10:34:42 +01:00
Friedemann Kleint
a20e698216 QNX: Fix compilation with Qt 4.
Change-Id: I2a3aadeaebca04ebacc7f199fb953098113c92b8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-14 21:54:15 +01:00
Fawzi Mohamed
9c17e9cb72 ios: simulator support for Xcode 5.1
update iossim to be based on version 1.9.0, so that we can support
the new Xcode 5.1. Keep the old version around and use it
with older Xcode.

Task-number: QTCREATORBUG-11714
Change-Id: I4ad9f922f22367c8371b3be68eae5b6dfdf4df5c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-14 21:35:28 +01:00
Ulf Hermann
64f31afd5d QmlProfiler: Fix order of updates to timeline contentX and contentWidth
contentWidth has to be updated before contentX as the WheelArea
underneath will clamp its horizontal value to its bounds on change and
thus break the update to contentX if contentWidth is growing.

As contentX is automatically updated by changes to contentWidth it's
generally a good idea to prevent any reactions to  that with a recursion
guard. When updating contentWidth before contentX this becomes necessary
for correct operation.

Task-number: QTCREATORBUG-11699
Change-Id: I34fff7a55e93745d658e8cbb5ac3d430a42770e8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-14 17:07:01 +01:00
Friedemann Kleint
94b13cdd9f Remove trailing newlines from QML Puppet messages.
Change-Id: Ibe184979568f5ba2d4635cf36c9206cf56d87bac
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-14 16:28:42 +01:00
Frantisek Vacek
2c732970b8 Qnx: Add support for qml profiler in BlackBerry/Qnx
We cannot set -qmljsdebugger arg in bar-descriptor.xml file since
it can be done in DeployStep only. QTC architecture do not allows this.

Current approach modifies already deployed MANIFEST.MF on the device.

This patch has nothing to do with QML analyzer for pure QNX,
it's purely for BlackBerry.

Task-number: QTCREATORBUG-10520
Change-Id: I89e83c6ff70a7a35344ff7e3fe573fc19e797ccb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-14 16:27:55 +01:00
hjk
1910fe9175 Debugger: Add dumper for boost::container::list
Change-Id: I251a859ca63bf932cb0d22ef11b5492b75ebcadd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-14 16:17:29 +01:00
Leena Miettinen
0962c0b03f Doc: remove Qt Simulator macro
The Qt Simulator is no longer mentioned in the docs.

Change-Id: I8730e45c75f2e69dadc053ebfa205aa7b6eef5fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-14 16:14:05 +01:00
Leena Miettinen
7b088afbe9 Doc: don't use the term SDK in connection with Qt
Replace with "Qt distributions" or "installers" or rewrite
in some other way.

Remove references to installing Qt 4 SDK, because it is
no longer available for downloading.

Change-Id: I291f82702e21d953f2efbb0e634d6454b4bc17b9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-14 16:12:10 +01:00
Jarek Kobus
2c42b06f00 Fix some strings.
Change-Id: Iaac415d25ebfac507df73fc4b3977425df521979
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-14 15:57:28 +01:00
Kai Koehne
12445a050c Fix QT_VERSION checks in logging.h
0x520000 is minor version 20. Use QT_VERSION_CHECK to avoid such
stupid errors.

Change-Id: I4408c0796b015f509ca9cfa8535dfdaf1603acae
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-14 14:39:00 +01:00
Marco Bubke
e9c5e60d50 QmlDesigner: Improve error message for puppet
Task-number: QTCREATORBUG-11713
Change-Id: Ic8721235a6db34803585d69f5bb8c2b2439e04eb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-14 13:50:27 +01:00
Daniel Teske
8a8afe42b1 ResourceNode: Remove unnecessary update() call
Change-Id: Iea72f2cb02b6b983cb90d4dd09c5e0fc1f8c0c3f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 13:07:26 +01:00
Christian Stenger
6f2c3d9cb3 LLDB: Stop creating zombies when executing dumper auto tests
Change-Id: I8a9d2e9e0027f60a9801ba9a20aab1c5e2991bdb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-14 13:00:55 +01:00
Ulf Hermann
0d3f7f0deb Android: Treat "fatal" messages error output
If you trigger a fatal signal e.g. dividing by 0, you'll get a message
with an "F/" prefix. That should be red, too, just like "E/" and "W/".

Change-Id: I8bef7ebf4e8c7d7ac3794750306073043852634b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 11:57:28 +01:00
Alessandro Portale
1b50faef8f WelcomeScreen: Adding links to Qt Account and Qt Cloud Services
Change-Id: Iec39fd4a44671c284e7442f40a1c3156a299437e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-14 11:50:17 +01:00
Alessandro Portale
1dfa2da87c WelcomeScreen: putting the "icon plus link" into a component
...more links to come...

Change-Id: Ic500f38995bf515eda80c0720d1fdd7718e5ff54
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-14 11:50:08 +01:00
Ulf Hermann
f9864efea7 Android: Properly split stderr into lines and drop unrelated messages
Change-Id: I860cddcea23692fd8c9b69b849e7b1fb50e9113d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 11:43:43 +01:00
Kimmo Leppälä
ffbb129f18 Fix deployment to Android virtual device
With the latest Android SDK Tools installed deployment to Android
Virtual Device failed since the format of "android list avd"
changed to include device tag information.

Task-number: QTCREATORBUG-11658
Change-Id: I72a2427dedfaf0cd7638b9805c545fda0bd6598e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Kimmo Leppälä <kimmo.leppala@digia.com>
2014-03-14 11:18:40 +01:00
Christian Stenger
c3a23cb862 Squish: Rewrite checkQtCreatorHelpVersion()
Change-Id: I994379476ab52df75a4a34a8e0db025ee2f3df70
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-14 08:02:52 +01:00
Robert Loehning
b071a0ad07 Squish: Update tst_git_clone
Command line information appears in Version Control view,
not in the dialog anymore.

Task-number: QTCREATORBUG-10531

Change-Id: Ib3a501e32d6105a78d8e4f4f1ad019de22e3ef3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-13 19:23:51 +01:00
Kai Koehne
bd1a922b2f Fix detection of language in QmlJSModelManagerInterface
Change-Id: Icdc458b7deab5903fd997051947224f9c8d26945
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-13 17:17:20 +01:00
Ulf Hermann
f5dc6bed45 Android: Don't read from adb logcat while PID isn't known
Otherwise we throw away important parts of the output.

Change-Id: I7ab6989c19660bcbb53d6ff61eda62878044ded2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-13 16:35:05 +01:00
Daniel Teske
911f6b5159 ResourceNode: Fix renaming prefix
Task-number: QTCREATORBUG-11719
Change-Id: Ib24dd7bf644bbebca3d9a694ec2b98709cfd6cf2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-13 15:45:45 +01:00
Nikolai Kosjar
349de9331c C++: Fix weird logic in usage of TopLevelDeclarationProcessor::processDeclaration
As the name function name suggests, true should be returned if the
declaration should be processed. Otherwise false.

Change-Id: I8d266d99c579b331fee8772bde47aa1a466dae9c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-13 15:41:01 +01:00