GitLab

Task-number: QTCREATORBUG-13129
Change-Id: Ie964e547809ee7626c526a6a3f5741f19b8a2f0f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

And do the required adaptation in QbsProjectManager.

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

The backtrace in QTCREATORBUG-13081 suggest that something with
dev.serialNumber is wrong. The input (attached to the bug report) does
not indicate why we would misparse it. So add checking code
to all places where we index into line.

Change-Id: Ic8e4afb763dc1c899e9a1d0503d6494e2aea1223
Reviewed-by: BogDan Vatra <bogdan@kde.org>

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

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

To HEAD of 1.3 branch.

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

Breaks BC with MSVC2010.

This partially reverts commit fe8ed7f5.

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

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

The label got lost in f1eb9c48

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

Task-number: QTCREATORBUG-12727
Task-number: QTCREATORBUG-12873
Change-Id: I1dffad5af9ac254fa17f89291db7baf640ed1851
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c

Task-number: QTCREATORBUG-13092
Change-Id: I3d059af748f0160ebfc97bebbd43de9210f17250
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

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

This was broken in fe8ed7f5

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

This was broken in d52ee686.

Task-number: QTCREATORBUG-13098
Change-Id: Ia075e13fdd00e561b78058a3cab0cb02d2eb5fe6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
(cherry picked from commit 2776536a)
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

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

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

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

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

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

This reduces unnecessary calls to ensureCursorVisible.

Task-number: QTCREATORBUG-12860
Change-Id: Iaf59642f3cee645f75d5319d3f6adc236b3f2ee2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Change-Id: I7e161a20a4b24635df4f6f373966c7e52cfb593b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error
to get it start up again.

Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969
(cherry picked from commit 1af0f77e)
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Partial backport of 5da75dba

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

The all/current project searches use metacalls on the UI thread to work
around thread-unsafety of the Project::allFiles method, so we cannot jus
t block the UI thread to wait for the old search to cancel.
On the other hand, many of the ILocatorFilter::matchesFor implementation
s do not work when they are run in multiple threads simultaneously (most
implementations access unguarded member variables, help index filter tend
s to crash), so we _do_ have to wait for the search to cancel before sta
rting a new thread.
Broke with 05c26767 and 6fc39f0c
00c5673ae80d03d115bf3739

Change-Id: I93c607c879e8ba6ef60f94719812edb3df43a154
Task-number: QTCREATORBUG-12875
Task-number: QTCREATORBUG-12592
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Task-number: QTCREATORBUG-13012
Change-Id: I70d45dcdc72408d46bea0b78746ab28c17f3b9e3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62224

.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppEditor::Internal::CppCodeModelInspectorDialog::refresh()':
cppcodemodelinspectordialog.cpp:(.text+0x79fc): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::definedMacros()':
cppcodemodelinspectordialog.cpp:+0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::headerPaths()':
cppcodemodelinspectordialog.cpp: +0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'

Change-Id: Ie0e01f7628668cbbe11b701a93caef98bb8e335f
Reviewed-by: Adam Majer <adamm@zombino.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit c023a1ca)
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

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

And replace some remaining "Mac" or "Mac OS X" strings
with "OS X".

Change-Id: I8ae1697a23e69fb840890c1d10887ddbe86a3c98
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Change-Id: Ibe161281e7dcdbba2c19fb23fac0546f2e592ad2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

Change-Id: I40ab7dc02492d9e71ebb8c209ab645a5bf095c94
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

And the new option to have Qt Creator build the emulation
layer using the kit selected for the project.

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

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

Change-Id: I22a16eaae505d43c31516db98290df3ec667b5e0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

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

Task-number: QTCREATORBUG-12847
Change-Id: I8b42631adf62cd9b6afea619a17bf01a725a2968
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

One line was overlooked in a recent patch that intended to do this.

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

We can't do that during parsing, as qbs::Project::buildSystemFiles()
might run into a race condition.

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

Not doing this makes the QPlainTextEdit interact with an invalid
layout, potentially causing crashes. Now the cursor setting itself is
not part of the undo stack anymore, but as undoing sets the cursor
itself, that shouldn't be a problem.

Change-Id: Ic6f8ee9781faed655ac20f058b562c098ced20ae
Task-number: QTCREATORBUG-12987
Reviewed-by: hjk <hjk121@nokiamail.com>