GitLab

Change-Id: Ib4b79f8ba27ab856dfeb93a8b697b087be90d633
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

Change-Id: I0c0cc577db9b75044ebd9f5fdc51cecc0f91e3ea
Reviewed-by: Adam Majer <adamm@zombino.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>

Change-Id: Ie2aae8ae8246fbdfb6d79ea250cca2ae35b96121
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: I1627f7d55d50f302f76c591345c021a3b400e43e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

When jumping to a file via the dropdown box: Have that block be
scrolled to the top of the view, not to the center. This is way
less confusing.

Change-Id: I5c629dda1af8bff76ca93a70357aa35c8efcb37a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

This was caused by the PersistentSettingsWriter writing the old
session on being deleted. Which was after we removed the file.

So delete the PersistentSettingsReader earlier.

Change-Id: I7e73775cc1c2e31b2f2a567b1d08efefdb3ee949
Task-number: QTCREATORBUG-14285
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

Easy to do and makes the dialog feel marginally nicer.

Task-number: QTCREATORBUG-13123
Change-Id: I64098f1fd751100d40227c298a9e7eb358552bfb
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Task-number: QTCREATORBUG-10298
Change-Id: Ib15a7aa015bf88ba89cb91451a9130bf452d8449
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

We need this when we want to use QtConcurrent::mappedReduced.

Change-Id: I4a6a31f4a0cc9a739a263cc148a1d51d7aa5d418
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

Conflicts:
	src/libs/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3

The text next to the checkboxes needs to be elided to fit into the
menu. The filter gets reset every time we clear and reload. The
checkboxes reflect this now.

Change-Id: If34188a4abb0c087a8f585653abcf0a787fc3232
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

... by relaxing the namespace checks.

Change-Id: I2c2978fe4e95bdc87df24fd6ecbcba4bf1913df3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ieb0b3d9a598b9c99f4339fa64e92cf8b72d4bf5f

This is a generalization of 134234be. '?QFoo' is now meant to
match both 'QFoo' or 'Ns::QFoo' in a namespaced Qt. '@QFoo'
continues to match 'Ns::QFoo' only.

Change-Id: I4285cd9f75a2e4cd94ec5dbb107214f75a60c810
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

It does not make sense to add files to anything besides products and
groups.

Task-number: QTCREATORBUG-14286
Change-Id: Iced8cefc4eff3857e9a1a6d3a3a9311dcbb44f11
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

We use a space between the number and the unit and use 'ms' or 's'.

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

We hardcoded the remote host to the SSH server for some reason, and the
originating port was bogus as well.

Change-Id: I8f6700bc12f4374302dd3bfc035c9c9f060f56ef
Reviewed-by: Caspar Romot <cro@icd.ee>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

The work around doesn't seem to be needed anymore. The case that
is described is a Creator hitting a breakpoint, but not being raised.
This works for me on both gnome and kde with this workaround removed.

Removing the workaround also fixes:

Task-number: QTCREATORBUG-13845
Change-Id: I4f751c701a17ee39679b951b9cf7d52a68552d9f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

Helps recognition of default std::maps and makes the StdMapQt
dumper test pass with LLDB on Linux

Change-Id: I2d2a91d65e895c7fc2c99e24cc77d21ca6353b22
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

To HEAD of 1.4 branch.

Change-Id: I870c6c8fb86fd06cb77a7c2a333442f05c9f69b0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

Broken by dcdcf540.

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

Change-Id: Ie2de2359225017cae7181bee0df17542fa36efd8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

VcsBaseClientImpl::createVcsEditor does do the same check.

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

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

This name makes it more clear what the method does.

Refactor to use VcsBaseClientImpl::vcsExec.

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

and rename it to vcsExec. Accept a QVariant to set as cookie on the
command instead of a int for the linenumber.

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

Change-Id: Ieb8b5a1ea998abbd2d3baf13829f81f9d4cc43e5
Reviewed-by: hjk <hjk@theqtcompany.com>

Give preference to videos about using and developing
Qt Creator.

Add new icon for 2014 and updated icon for 2013 with new logo,
and remove icon for 2012, because it is no longer used.

Change-Id: If7f34b03247eb8cbe68b9460efbb55dc42770dd4
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

Not much harm done, the code was meant to raise an exception anyway...

Change-Id: I81db4081b4ca583e46a826aaee2fc8fa3f186a11
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

Older versions of GDB (~GDB 7.4 on 32 bit) will cause segmentation
faults in inferior calls due to misaligned %ebx values in an SSE
call in qstring.cpp:findChar.

Change-Id: I44492106080f12e645f9d57828438ec70fd66ca6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

Change-Id: Ib3d48607a66199255fbcfc90815d104bc9cd0402
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

It's not clear why we need it there, it's generally not advisable to do
qApp->processEvents() and in this case it clearly creates problems.

Change-Id: I2707ef0ec98ee761078283ee3ce3f76f9da95f31
Task-number: QTCREATORBUG-14215
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

appendCommand() is already called by runVcs.

Change-Id: I215ac00d0efc36e5f62865d7d2cf9941533a160d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

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

The base class should delete the d-ptr and the derived classes
should delete the members they add. The missing virtual destructor
in TimelineAbstractRendererPrivate constituted undefined behavior
(which wasn't triggered as it was never deleted) and the missing
destruction of render states and d-ptrs was a memory leak.

Change-Id: I4db9e5e2d6f23a3a58541c48ce08aa8fe5951cc9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

I see no reason why that should require source encoding.

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

Disentangle binding to an existing command from the actual task of
the conflict handler. This makes usage more clear.

Also rename "command" to "abortCommand" which is also more clear
as to what it is used for.

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

Change-Id: I81bd8eface83f4b505c0ff30dfcfc74882001f3a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>

Change-Id: Ia769c16761a171e3e472144cd3ace3280ae5a6aa
Reviewed-by: hjk <hjk@theqtcompany.com>

Task-number: QTCREATORBUG-14225
Change-Id: I5416b21dc0494825a892e42ae6bd4ff6f4cc0a56
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>