Commit Graph

21595 Commits

Author SHA1 Message Date
Daniel Teske
77ddc869e0 Qt4Project: Use exact parse to decide which runconfigurations to create
Task-number: QTCREATORBUG-9549

Change-Id: Ib504073a3dfbdf8a66429b3fb6a8930d2284f76a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:13:05 +02:00
Daniel Teske
f8034a353f Qt4Project: Don't update runconfigurations for all targets
Change-Id: I383d0c5b7f01bf00be3249dc2721e69ed27dc148
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:13:01 +02:00
Daniel Teske
cc7fe5eac6 Project: Simplfy file adding/removing interface
The filetype is only relevant for Qt4 projects. But even for Qt4 projects
the file type is insufficient to decide where the file should be added.
So remove the file type from the interface and let the projectmanagers
themselves figure out what they want to do.

Also fix
Task-number: QTCREATORBUG-9688

Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:05:04 +02:00
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Eike Ziller
07c0a8348c Progress summary: Forward click to "current" progress details.
It was annoying that it wasn't possible to click on the summary progress
bar to e.g. open the compile output or issues pane, even when you had
only a build running.

This change forwards the click to either the progress that currently
shows a details widget in the status bar (like the build errors/warnings
from the build progress), or to the last progress that was started.

Change-Id: I4b50dd4b43bdc12fac329d33e158fa759bee4d28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 14:32:55 +02:00
Orgad Shaneh
2c21100725 Git: Disambiguate branch/tag names
Task-number: QTCREATORBUG-9700
Change-Id: I48e779fba65afc71ba13b426e526c3cb82070142
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:28:23 +02:00
Daniel Teske
bcd5ce77b4 Qt4Project: Remove unused function declaration
Change-Id: I7cd020b35b95340007e9ec9c7a3bd41a59481f84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:27:59 +02:00
Daniel Teske
f34a4a6000 CMake: Set a initial displayName for projects
We set the display name for cmake projects based on the projects's
name in the cdb file. The parsing of that happens quite late, so
we need to set a fallback displayname in the ctor.

Task-number: QTCREATORBUG-9641

Change-Id: Iabfef7a3cc9710e6ba04523845d4142a89493011
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:26:53 +02:00
Orgad Shaneh
b2a09f7b45 Git: Rename branchName -> fullName
The model can contain tags

Change-Id: I70a75534848232476447125801a5ca7e963bbdcc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:22:31 +02:00
Orgad Shaneh
2af4c05b8c Git: Use -x for cherry-pick
Change-Id: Iaa6bfdaa1307a3c7a73fd80fb0ffe3b80a01312d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:21:47 +02:00
Orgad Shaneh
aad68917b9 Git: Always allow stash before cherry-pick/revert
Currently done only from "Actions on Commits"

Change-Id: Ide34e198e72f554ba6fd75ef21aaaf35917b4f6a
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:21:41 +02:00
Orgad Shaneh
8aa1c9bc37 VCS: Remove removeColorCodes
status output can be uncolorized using the git config value
color.status=false (works for short status since git 1.7.0)

Change-Id: I0887ab9a02f4c98fe54a94a53ffcd4f91fef8699
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:47:56 +02:00
Eike Ziller
7017e95531 Progressbar: Fix uninitialized variable
Which lead to progress indicators sometimes not having a cancel button.

Change-Id: Idd470411c02686b6975c1e7efd79ac802eb37037
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:47:33 +02:00
Orgad Shaneh
54b7146986 Gerrit: Notify on invalid configuration
Task-number: QTCREATORBUG-9548
Change-Id: I4c5f9a4c6b7a818d296a923df1d665c22afd8292
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:47:03 +02:00
Orgad Shaneh
ffdd317773 Git: Support remove/rename for tags
Change-Id: I737d2405ef1a10ec451c4baceaea9a0bc194ac1e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:43:13 +02:00
Orgad Shaneh
0ae3d29a66 Git: Simplify button enabling conditions in branches
Change-Id: I6484dd62eac80e1e4aba00890926e7dfb542f0be
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:30:34 +02:00
Daniel Teske
5948bcf328 AndroidSettingsWidget: Don't show a message box for wrong settings
I believe this is responsible for the crash reported in
Task-number: QTCREATORBUG-9724

Change-Id: Id5721e46b9dc9587ff8423cd3d5e6aa9107e7dba
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-08 11:48:23 +02:00
Daniel Teske
7517a3408a Android: Show more information in the compile output for devices
Task-number: QTCREATORBUG-9690
Change-Id: I9b3e20db9049edc42364b005a7920a040f3feaf7
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-08 11:47:02 +02:00
Marco Bubke
514ba53b35 QmlDesigner: Add capturing for qml puppet streams
Change-Id: I094e01b85cfe1ddafb0590f56d9d5b810a390cb4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-08 11:28:44 +02:00
Orgad Shaneh
45ccd7d919 Git: Fix crash on checkout branch
Task-number: QTCREATORBUG-9756
Change-Id: I3bdba870737bbffde6c0e6a9046a58ba78f097be
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-08 11:24:03 +02:00
Orgad Shaneh
a6626b49c4 Git: Reorder reset types
Hard is now the default (as it is in 2.7), and the types are
properly ordered

Task-number: QTCREATORBUG-9733
Change-Id: I54fb22543bf31f43381e57fb0acf4aeb15e8a293
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-06 20:18:52 +02:00
Orgad Shaneh
3cefd0288e Git: Remove wrong assertions
Changed in 89523c14

Change-Id: I872c37633a877e982046b2a44266159d86defbde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-06 20:18:14 +02:00
Friedemann Kleint
2651b1aa7e Debugger: Display unsigned hex values in watchhandler tooltip.
Change-Id: I2605c29ecb4417ce114702ef9d878343cc67b72d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-05 16:55:15 +02:00
Daniel Teske
2a030ac95a EnvironmentAspect: Fix various aspects broken in the refactoring
Switching the base environment needs to update the environment.
Fetching remote environment didn't work.

Task-number: QTCREATORBUG-9734
Change-Id: I4dd0052b364c5c3cfea17d8169de8a235d37b891
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-05 16:53:04 +02:00
Friedemann Kleint
1f338e53ff Fix debugger watch data tooltip.
Display value correctly, omit empty display types.

Change-Id: I840a8bb1db65d721f871b9c33ca327f2ba6c8e26
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-05 11:16:03 +02:00
Petar Perisin
6312cc18e2 Git - added ability to launch git gui
Change-Id: I65ed3e0408e43e354a289bbbd385aec2e254746c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-05 10:16:59 +02:00
jkobus
c59c1661d1 Fix jumping to wrong line after double click in left view
Task-number: QTCREATORBUG-9655

Change-Id: Ide2a68e4d49b0bb17d745e7f13f1c565b8629c03
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-05 09:43:08 +02:00
Eike Ziller
5d5b769281 LineNumberFilter: fix uninitialized variable
Change-Id: I90c1330633e5568b7c94059d4286c93adfecb1a2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-07-05 07:23:25 +02:00
Orgad Shaneh
2103a4a96c Git: Clear branches model when repository becomes empty
Change-Id: I78932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-04 17:59:49 +02:00
Orgad Shaneh
49bad12787 VCS: Emit repositoryChanged when ExpectRepoChanges flag is set
Change-Id: I7ae5199a1397258c9816ff1801fb5d0909feb626
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-04 17:59:30 +02:00
Marco Bubke
24d1e54490 QmlDesigner: Rename removeVariantProperty in removeProperty
Change-Id: Id350f7d3e215d08210a3a535f89b12fe15928321
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-04 17:05:53 +02:00
Marco Bubke
7048709ab8 QmlDesigner: Clean up form editor code
Change-Id: Ife16e84a7b9d1c41ec6481c7d91a1872281a1064
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-04 17:05:45 +02:00
Orgad Shaneh
a26c884b70 Git: Preserve current selection on log change refresh
Change-Id: Ic6be652a1d5cca87ae5effdcb3cb5df7b1b73c2c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 16:57:43 +02:00
Orgad Shaneh
be5133cf72 Git: Update branches dialog when repository is changed
and on fetch

Task-number: QTCREATORBUG-9667
Change-Id: Id2e5080502bbc28d5f7900dd0433e468dda56c82
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 15:26:39 +02:00
El Mehdi Fekari
10f2e59aed Qnx: Add BlackBerry kits for qt5
Qt5 is available in the internal 10.2 NDK builds.
N.B: This is for testing purpose (internal developers).

Change-Id: I0858e05f5902d602a0f921ed22f34b79d557a10a
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-07-04 14:14:06 +02:00
Daniel Teske
6773d47a63 AndroidDeviceInfo: Rename cpuABI to cpuAbi
Coding style.

Change-Id: I433b4d47f54c5a3a9aed68d99b2ab64a7e82d698
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 13:05:29 +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
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
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
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
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
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