GitLab

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

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

Change-Id: Ia951c1e816a4c333ebf099d774405c41003c4966
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

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

this is undeniably a new feature, but it's needed for a bugfix.

Change-Id: I951a3128eb580404ee0c7e3cdcb4d6170e899f70
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/87054805872429c1c17135f9ae5364b050d3fdff)

otherwise variable assignments (including -config options) from
$QMAKEFLAGS are lost.

Change-Id: I818e9372d2b0ff44333dc3eb8fc3420f84ab01c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/864e1ceaf628e823103ae2d28d2c983400ba38c7)

Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/4d55b473b3a1514c53dc5ee8116e2c86e4f62eb6)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I0c8b48e6491486ca829ce24ca2e284294ba0138a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/9a1183b400748aa51132dd17d004d9d6e560b5b8)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I8c987e8eed555c9c976732e216553d8002ee2b87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/d9dc9d34ec092ddc536a907b4f5009fb8bf01da4)

Clang complains that these values may be used uninitialized if both
conditions are false. This can actually not happen, so just initialize
them to 0 to quiten up the compiler.

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

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

Fix spelling, add blanks after punctuation, change to HTML to get
paragraph formatting and highlighting of the paths. Use native
separators.

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

If in case of an error we should not detach the rewriter
and we always should attach the other views for simplicity.

The model is a valid ( Item {} ) and all the views are in a proper state.

This makes recovering and changing the mode back simpler, since the error
case is not a special one.

We do disable the widgets and show the error message of course.

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

Without this information, qbs cannot work at all.

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

qbs::logLevelTag() returns a QString now.

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

Change-Id: Ieeec4be993b1c53a59407349d365a6aaf1a92e32
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: I5389d6aadd39f6c7f7ca6a74e006b110373eee28
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

An app with Qt Quick {1,2} Application template is installed under /opt/
and there is no easy way to change the installation path.
This change allows users to set installation path in the main pro file.

Change-Id: I0325c54187f781b1ceaaddfd41e913117fa445e6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

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

This is the same as what the Remote Linux code does.

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

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

Change-Id: Ibd8ca7b8f87e541c189b2631dcd2f07026035550
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Logging API was updated.

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

Moved check for NULL-pointer earlier

Change-Id: I764bd3c6c0545e7fa0784327375cdf7d06b29a31
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

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

Fix capitalization of the new UI text.

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

The \i and \o commands were replaced with \li and
\bold was replaced with \b in QDoc for Qt 5.

The \input command was replaced with \include in the docs.

Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

qdoc does not expand variables in include() statements, so we need to
use separate top-level "switch" files.

Change-Id: I3152baa36cb3dee055abdc68c046b445f92e1fb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Since we support Qt Quick 2 and 1 force
import is ambigous and does not make sense.


Task-number: QTCREATORBUG-8560
Change-Id: I49491215e1f2ea6ef8284b0f5f5793ff4e70dea3
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

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

Change-Id: I88f911226a1e08a5455a3fc5e06529fdd04a95dd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Since we will not ship qml2puppet with all version of Qt Creator,
we need a detailed error message.

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

For deleting Items we need a QmlModelView to delete
dangling property changes.
In the past we "missused" the FormEditorView.
For now VewManager will expose the form editor as
a QmlModelView.

I also cleaned some includes and removed debugs.

Task-number: QTCREATORBUG-8650
Change-Id: I22ca7c5f741324532e81918571be39babd12d2e4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

This allows property sheets to take the version number into account.

Task-number: QTCREATORBUG-8681
Change-Id: I22a99fd30ba42572f070f67a56bb24fd1a04275f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

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

Actually it was connected originally to a empty slot.

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

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

Translation for button and for dialog title may be different.

Change-Id: I603df990c074bb40a8a895c7e630587d0aa89aed
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

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

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