GitLab

Change-Id: I48aff6a1a94ca3c0bcd8b0689333b6acad7d35cd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Make the function generateEnvironmentSettings public and static,
so it can be used by other plugins.

Change-Id: I5f649e311059bcaf5b239c37e323a021175024b2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

And also in DeployConfiguration.

Rationale: Consider this typical use case of a deploy configuration
factory that can create several deploy configurations for a specific
target.
ProjectExplorer::DeployConfiguration *MyFactory::restore(map)
{
    ProjectExplorer::DeployConfiguration *dc = 0;
    id = idFromMap(map)
    if (id == myDcId_1())
        dc = new MyDcId_1;
    else if (id == myDcId_2())
        dc = new MyDcId_2;
    ...
    else if (id == myDcId_n())
        dc = new MyDcId_n;
    if (dc)
        dc->fromMap(map);
    return dc;
}
This does currently not compile, forcing us to introduce n variables and
calling fromMap() n times. In addition, we either have to make the
factory a friend of all the deploy configurations or add a public
fromMap() function into all of them, even if they don't add any
functionality, or introduce some other type of silly boiler-plate code.
All of this becomes unnecessary when fromMap() is public in the parent class.

Note also that fromMap() is public in the inheritance root
(ProjectConfiguration) as well as in RunConfiguration.

Change-Id: I4c6431bba2500e2434c487c316e30ddb259fa2b5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I11faa5af0c186a9126c4af6f86e56250030d6cd9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

The Hijack button (makeWriteableButton) should only
be shown for snapshot views.

Change-Id: I809981885d18b6057d82f73b5104b0f1041cd255
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I91b8bee6e714612d01092325c70d8bb69746a9ac
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

The "Key sequence" edit showed a wrong placeholder text for actions
without a shortcut.

Task-number: QTCREATORBUG-8109
Change-Id: I3764275e0c99cb53964b16ff4b06602c48661cf1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

For auto-detected devices, it is reasonable to assume that their state
changes from time to time, e.g. because a USB cable is unplugged.
Currently, whoever is responsible for syncing actual device state
to the one in the DeviceManager has to do the following:
    1. Get the IDevice from the DeviceManager.
    2. Clone it.
    3. Change the state in the copy.
    4. Re-add it to the DeviceManager, where the current object is
       being replaced (and another copy is made).
This is rather clumsy and unintuitive. Therefore, we now provide
DeviceManager::setDeviceState(), which turns the above into a one-liner
for client code and does not involve any copying.

Change-Id: Ic9f27e5c9f33c2b3a2f6de1976f12df1e78baf2e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I46b91fba5cf78a3e540c3a07baee3354265c977a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I400e28ae7d1d4f0250519dcd3c85746da1ea1e93
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I5a5c41448d521af5aa60b92b804c8fd965b90906
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I2a7504956baeb3c8bb9b60b06952d38e0676a1c8
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

Change-Id: I50ccb0f6e0e70f463e45feaea8237c434f5f76c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Depends on Qt widgets.

Change-Id: Ie269aca67ff651d4cdd0d06439dd5156c5d7baff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

It's possible to use FakeVim as standalone plugin for a QTextEdit or
QPlainTextEdit widget, so there should be minimum dependencies on
Qt Creator code.

Change-Id: I415ed87f5e4d97ea78d9d25a8f0c82701ef1f70d
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Ida6ada411ec818d7570f36d1d58576a93b8262ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

Now 'address' always refers to the address of the object or
field mentioned in a WatchItem whereas 'origaddr' is
optionally used for the address of the pointer (not its
value) pointing to the object/field in case of "autoderef"
pointers.

Change-Id: I718eb13e6147dafca016c85db6c8b31c631cc764
Reviewed-by: hjk <hjk121@nokiamail.com>

Was broken by f30b4db8

.

Change-Id: Ic592d9bc68cdd62980212eb2d397688e9be08d49
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I20b02633bf9115f799353a241afe42fefe48d119
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: Ibb5ee6c58dc8118f115bf2f1ce9c0d9999d65726
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

...since it will be displayed in the dialog anyway. Furthermore own
debug messages are easier locatable in the host creator because you do
not have to scroll away the printed backtrace.

Change-Id: I108580084f3f2fc641a44a69718e137a480ad790
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Currently, pressing Ctrl + Shift + Up/Down with a commented block of
text selected will indent that block if the line two lines above the
block is indented. This is undesirable, because the indenting for that
block is incorrect when it is uncommented. See the following example:

Step 1:
void f()
{
    int x;

//    int y;
}

Step 2 - After Ctrl + Shift + Up:
void f()
{
    int x;
    //    int y;

}

Step 3 - After uncommenting the block:
void f()
{
    int x;
        int y;

}

This patch tells the CPP and QmlJs editors not to indent commented
blocks when moving them. Blocks that are not entirely within comments
(excluding whitespace) are not affected.

Tested with (C++ and JavaScript, respectively):
http://paste.kde.org/688778/
http://paste.kde.org/688784/



Change-Id: I35414e6dfd5a1084fd997594e711ea9932231981
Reviewed-by: David Schulz <david.schulz@digia.com>

This signal is generated if abort() is called. This happens e.g.
  1. if there is an attempt to call a pure virtual method
  2. if Qt detects an uncaught exception or printing a message fails
     (qlogging.cpp, qt_message())

Change-Id: I6a1d8f094a884ebc6bfc6a1fc168aea8afe825b5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Change-Id: Iab4dee2a607d453b3e80fe591b70329ab48d27a9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

- non-const ref iterator
- values or keys iteration

Change-Id: If04abcafbeb8d5d143097ae66589b6f18bd7e28d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

When killing the blackberry-connect process, we get an exit code != 0,
so it's treated as an error. Disconnect the signal-slot connection,
to ignore any exit code we get.

Change-Id: Ib08298007dd454c49087e5b62d8aef08963dd097
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>

Change-Id: I477d44cc83beb017b12deb9dfb81b3be386ea4e0
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

Change-Id: I7195ef05160f0af26143f81fbe744b3186f16df8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Task-number: QTCREATORBUG-8879
Task-number: QTCREATORBUG-7561

Change-Id: Ie61c6571d5398c48196876ea2eb6460f5f43caec
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9

- values or keys iteration
- non-const ref iterator

Change-Id: I6bb58793b3155243e0fbfaf33ee43ce60edea8d1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: I6af10e51c25ae63d33f15f35960362e7f529721b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: Idfe968cd6967e096b8b2b32c02ad7491c7f95a77
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I9b9ec78d75d3ea4e00f94b715995d65a7c75e674
Reviewed-by: hjk <hjk121@nokiamail.com>

If somone watches "&foo", let's display the &, instead of making f an
accelerator.

Change-Id: I633801b2ca1a3f982ad159d62e7189503ce5f72b
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Ic207120b5a4109fa8a9a521be6cb0bbbcebc8f9b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: Iae3d4b5db84c4a5f59ff8b4b1208b02b895df00f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Find Desktop kit that matches detected QtQuick import, and has
a viewer.

Task-number: QTCREATORBUG-8900
Change-Id: I3d32dbc7a304dbeb36647dd4de9864e665f5a59f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I3840f778e9ce60c61944d03a5a188f2ebdd4539d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

This allows using override if the compiler supports it.

Change-Id: Iab04c82cad833324201458621639425010623786
Reviewed-by: Eike Ziller <eike.ziller@digia.com>