Commit Graph

31174 Commits

Author SHA1 Message Date
Thomas Hartmann
f6303e6784 QmlDesigner.QmlPupppet: Keeping the puppet from stealing focus on Mac
Defining QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM keeps the puppet
from stealing the focus of Qt Creator on Mac OS X and Qt 5.

Task-number: QTCREATORBUG-9418
Change-Id: Id0193b95d4c788ebe243773458645d1c584b2044
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-04 13:02:06 +02:00
Daniel Teske
7449297dc4 Android: Remove apiLevel parameter from connectedDevices
Both callers do filtering on the api level afterwards, so it pratically
serves no purpose.

Change-Id: I8f54f9050a66185a3799ea5b5446dec935d2d5ac
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-07-04 12:27:53 +02:00
Daniel Teske
16908f5733 Android: Make getDeployDeviceSerialNumber not start a avd automatically
This allows the caller to do that as a fallback.

Change-Id: Ifd50036317c7df4fe77fc34ea0f616c07611a517
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-07-04 12:27:41 +02:00
hjk
ccf0abf781 Debugger: Fix Q{Size,Rect,Point}F dumpers
They were only showing the integral parts in the
summary line. Duh...

Change-Id: I5efd7a9d5b7bfd6ffd68dcda824c95dd7a7a52b0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 10:31:41 +02:00
hjk
7a359baa50 Debugger: More LLDB dumper work
QLinkedList, QMap, ...

Change-Id: I4efd7a9d5b7bfd6ffd68dcda824c95dd7a7a52b0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 10:31:11 +02:00
hjk
0ebe100da9 Debugger: De-const, part 2.
Change-Id: Iabfb8980c18790d2f81d6991fdf91fb164a39329
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 09:22:44 +02:00
hjk
a197d7a0b9 Debugger: Ignore differences in 'const'-ness in type column
It's generally not too useful to see it at all, and in cases of
'const int' vs 'int const' it just defeats the test's purpose.

Change-Id: I3439dd8fcee28ffd1e599300a1c12f3215823573
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 09:09:46 +02:00
Sergey Belyashov
568c31b878 Russian translation update
Change-Id: I3efd7a9d5b7bfd6ffd68dcda824c95dd7a7a52b0
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-03 18:12:20 +02:00
hjk
a036f7f1e4 Debugger: Fix more LLDB dumpers
Simple QVariants, references, const pointers, QObject names,
QList<Foo*>, ...

Change-Id: Iaa3fb9e4db1c249817e59239029db7dd220ba5b3
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-03 17:07:20 +02:00
Eike Ziller
8685ff8a28 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
2013-07-03 16:55:27 +02:00
Eike Ziller
b05603a44d Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	qtcreator.pri

Change-Id: I6726277830ddbd3b21391b5c5e48880929a2d725
2013-07-03 16:53:25 +02:00
Robert Loehning
fbdbd11aa3 Squish: Added note about possible problems with netsh
Change-Id: Ic54abb4d014b8eaf71cbda490e5b4206dbb3da3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-03 15:05:03 +02:00
Orgad Shaneh
20e9b33741 VCS: Use relative path for apply/revert chunk
Task-number: QTCREATORBUG-9715

Change-Id: I3bfaea3922ace396230ef5e215712a9f3459808b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-03 13:34:38 +02:00
hjk
db4ce016bc Debugger: Fix a few LLDB dumpers
Change-Id: Ibdf3ff3f03cfc91df44168243972b1e5a0ee5077
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-03 13:30:13 +02:00
Robert Loehning
8dd0ddfcdc Tiny translation tweak
Change-Id: I6cec0ab8ff700d7a9b6238940fe02f4043af066a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-03 12:05:25 +02:00
hluk
fe20970f12 DiffEditor: Fix name for style constant
Change-Id: I8fdbcfc702574a0b61f57bb3d92594b66b2171df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-03 07:42:12 +02:00
hjk
e5c394cb26 Debugger: Distinguish values and addresses properly in dumper interface
Change-Id: I1e8874106ecd7376aa9a552977f6827b07d246b1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-02 19:14:26 +02:00
Eike Ziller
15408b5369 Bump Linux requirement for binary packages
Change-Id: Ia1ac5e2480bc7dbee4ae4a7237a3d0f7427da015
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-02 19:02:45 +02:00
Friedemann Kleint
1130afde57 Update German translations for 2.8.
Task-number: QTCREATORBUG-9712
Task-number: QTCREATORBUG-8923
Change-Id: I04367cf56be533cc8d078bb232362de9e5cbfe95
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-02 16:50:47 +02:00
Christian Kandeler
b403732934 QmlJSTools: Fix language detection bug.
Due to what looks like a copy/paste error, qbs files were detected
as actual QML, resulting in a torrent of parser warnings for projects
containing qbs files.

Change-Id: I8f4886621641d42bb0b2aa066a0bbdc44b9d8221
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 16:38:16 +02:00
Chris Stylianou
af9978fd5c Fix incorrect uname usage.
The POSIX function uname() can return any non-negative value for success.
- Example: Solaris 10 returns 1 on success.
See: http://pubs.opengroup.org/onlinepubs/009695399/functions/uname.html

Change-Id: Ic3d51f94a31d8b562b28a2d09df3d31b04c77dc8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/e97c37a37ac27f9ab901e974f0a882e81ffd571d)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-02 15:37:18 +02:00
Thomas Hartmann
2767b77d44 QmlApplicationWizard: translation fix for QML wizards
Fixing the generated context and extract from the right element.

Change-Id: Ibb454e82d6f197014451399bbb8a9fc0bad04a99
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-02 15:34:15 +02:00
hjk
964d1212da Debugger: Make more dumper work without debug info
QRegExp, QHostInfo, QDir, QTextCursor

Change-Id: I2a368f8d294a235076491e4c50fc79039a2c9cff
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-02 15:30:07 +02:00
Erik Verbruggen
afa66ab9c7 C++: fix potential deadlock when closing an editor
When the editor is closed, the CppEditorSupport waits for the
highlighting and semantic info futures to finish. These futures might
access the CppEditorSupport through the CppModelManager, causing a
deadlock on the m_editorSupportMutex.

Change-Id: Ifeb3864ed3bc2666d83607ef50d7bfee8f3d118f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-02 15:27:54 +02:00
Nikolai Kosjar
99647b89e5 C++: Add clarifying comment about local include handling
Change-Id: I96486983460bb72dc7b7fa993863b2938e99a8b4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-02 15:17:43 +02:00
Christian Kandeler
5bca241afb Device support: Make device testing a "well-known" concept.
This entails the following:
    - Rename AbstractLinuxDeviceTester to DeviceTester and
      move it up into ProjectExplorer. The class stays
      unchanged, as there was nothing Linux-specific about it.
      The same goes for the associated dialog.
    - Move the createDeviceTester() function from LinuxDevice
      to IDevice and introduce IDevice::hasDeviceTester() to
      enable generic code to make use of this feature.
    - Move device testing out of the list of opaque
      device-specific actions; instead, the device settings widget
      now uses the device tester directly, if applicable.
Rationale:
    - Device testing, just like remote process listing (if not more so),
      is a general concept that implementors of device classes will
      probably want to implement (and they should be encouraged to do so).
      Without the mechanism provided here, they would all need to put
      basically the same code into the actionIds(), displayNameForActionId()
      and executeAction() functions.

This patch is the natural extension of b90e3bbd8b.

Change-Id: I94f2badb4ceeda9f5cd3b066c13626bb4f65505d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-02 15:02:48 +02:00
Daniel Teske
d6062643c3 QtQuick Ui Wizard: Create right runconfigurations for Qt Quick 2 ui
The wizard doesn't need to write a .user file, the code in fromMap
handles that case.

Task-number: QTCREATORBUG-9678
Change-Id: Iea308fb8afd1248b8bf15d5825ba94b95b4916a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-02 14:15:03 +02:00
Lincoln Ramsay
f500c4c987 Call refresh before checking the splitter sizes.
If we don't do this, we miss the "current" size when an output pane
has just been shown (it comes out as 0) and we resize it to the
minimum size.

Task-number: QTCREATORBUG-8877
Change-Id: I8b1cc19d116dde6edcf8770bb36d1598dfdce195
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 13:10:01 +02:00
Eike Ziller
c531970b57 Add EditorModel::openDocumentCount and use it.
As is, EditorModel::rowCount() could also be used, but this will most
probably change later. So we simply add a method that is independent
from all the "model" methods.

Change-Id: I39a2338d765ed6a269bf8977b816a5eda371afdf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 12:17:30 +02:00
Fawzi Mohamed
eb1d87b30f qmljs: coalesce resets of code model triggered by cpp files update
Use a timer to avoid resetting the model too often.

Change-Id: Iadf3ff3f03cfc91df44168243972b1e5a0ee5077
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-02 12:11:58 +02:00
Nikolai Kosjar
c264c0d213 C++: Fix resolving ui_* files in CppPreprocessor
The working copy contains the artificial ui_* files and therefore we
have to consider it while resolving include files.

Task-number: QTCREATORBUG-9683
Change-Id: Icb3387b4cd885b3652bae3f1da465d3e0f633332
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-02 12:09:43 +02:00
Thomas Hartmann
69a00cbabe QmlDesigner.PropertyEditor: extend lookup rules for extensions
If specifics for pane .qml files are located inside the plugin
in the designer sudirectory, we still required the path to be fully
qualified.
e.g. myComponnents/designer/myComponent/MySpecifics.qml

This is unconvinient and also a behaivour change for pure directory imports.
Pure directory imports were not fully qualified until recently.

With this patch we also allow:
myComponnents/designer/MySpecifics.qml

Change-Id: I9a61016f425caf5d7d15140554c72f4a69a6687a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 12:04:15 +02:00
Erik Verbruggen
a8a49c9851 CDB: fix breakpoint location in catch clauses.
Task-number: QTCREATORBUG-7336

Change-Id: I926e82499325e4fe38e25cc7a6158050f7fc0e82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-02 11:40:23 +02:00
Daniel Teske
cdbbf37743 Qt4Project: Do not trigger updateCodeModels on folderChanged
This reverts commit 2fdb70bdce.
Be smarter about what to do on folder changes. Trigger at most
one codemodel update per folder change signal. (Thus still fixing
the original problem 2fdb70b fixed.) And only trigger one if the
actual file list changes. This could be further optimized to only
tell the code model about the new files, but that's for another
patch.

Task-number: QTCREATORBUG-9697
Change-Id: I78d134663f1455254caf812c27c048d4f0828242
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 10:33:04 +02:00
Orgad Shaneh
3e117b125d SynchronousProcess: Use the same codec for stdout and stderr
Change-Id: I4a7e5a5748dd9e16b1e62b3879cce8ccab0f3e01
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 10:29:13 +02:00
Friedemann Kleint
dea9672862 Fix translation context of "Attach to process".
Task-number: QTCREATORBUG-9712
Change-Id: Ib46e4c91a520044bfa9fb717edecee167b68076e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-02 09:38:14 +02:00
hjk
ec0fb652c5 Debugger: Make more dumper work without debuginfo
Change-Id: I2ff23b81dc27be1052c36cffb7ad16dbea6fa339
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-02 09:32:17 +02:00
Christian Stenger
6f5ac8ce76 Tests: Compile fix
Change-Id: I3363d46218feaa9f9196ede9c16f7b90c4fd320a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-02 09:26:19 +02:00
Orgad Shaneh
00337585ab Git: Add some null protections
Change-Id: Ia28c70690c6f79499fb8075935ec123b763bcc01
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-07-02 08:52:30 +02:00
Orgad Shaneh
5f131da166 DiffEditor: Show tags and branches in Show pane
Change-Id: I39be7c3fb9b57b133c4da3639813527aa280ae33
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-07-01 15:50:12 +02:00
Orgad Shaneh
32217a0c3c Git: Move static strings out of GitClient class
They're only used in gitclient.cpp, define them there

Change-Id: I601f23a6f2a8e533127d2ed068526815e1b9717d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 15:42:16 +02:00
hjk
abc6e351b8 Debugger: Make QImage dumper work with release versions
This accidentally also allows non-debug Qt users to reproduce the
http://blog.qt.digia.com/blog/2010/04/22/peek-and-poke-vol-3/
smiley drawing.

Change-Id: Ica436f55494d012d5516ef9d00d6310f2ac2d4ee
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 14:21:43 +02:00
hjk
0292600c72 Debugger: Work on dumper without debug info
Change-Id: Iae5f60fe43c28f4cf0254b87530002145dc67e27
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 14:21:05 +02:00
hjk
d238959a2b Debugger: Add auto test for QByteArray::Data dumper
Change-Id: I2be3fe953f497768c564e393e3f2b23b47a1fa1d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 14:20:28 +02:00
jkobus
2b3d38b426 DiffEditor: double click doesn't select the current word
Task-number: QTCREATORBUG-9381

Change-Id: Icc96c31b029d978c23a44fca59bcc28891fd92c6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-01 13:33:53 +02:00
Eike Ziller
4a596c8eee Remove script manager and script debugger engine.
Doesn't really serve a purpose any more.

Change-Id: I8c3bc11bf7b05a15eafd2a22456a40b270cefadf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-01 12:01:11 +02:00
Eike Ziller
2f8f083b40 Unify pattern used for privates and constructors
In the 'managers' from ICore

Change-Id: Iab98c9e0947b759843a62e3777ba46be3b304b06
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 11:52:35 +02:00
Orgad Shaneh
f621ee5bc4 Git: Diff current file against index
Task-number: QTCREATORBUG-9663

Change-Id: I18b4ec5577bf0114075141583c938eaa02d5eded
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-07-01 11:22:49 +02:00
Orgad Shaneh
893b1e9a16 Git: Support commit.template under ~
Task-number: QTCREATORBUG-9530

Change-Id: I21ee4202aa750a9d4d89f05d51af7c63489eb6c3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-01 11:21:54 +02:00
Orgad Shaneh
338e9a092b SettingsAccessor: Fix empty environmentId handling
* Empty environment should be ignored when comparing to current one
* Fixes superfluous warning when opening a .user file without environmentId

Change-Id: Iaf3f71eb2dd2a2a10faa1f6f9fe9e9154fe1ab1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-01 11:19:35 +02:00