GitLab

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

Fix crash when not passing and error-pointer to the methods running
Qmake.

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

Fix code completion for nested classes when enclosing is
template class.
Unit tests

Task-number: QTCREATORBUG-8245 (only standalone)
Change-Id: Ib31ad4b799db927b56debd4dc3e7403404c1839d
Reviewed-by: hjk <qthjk@ovi.com>

Instead of checking each file's full path individually we store the
cleaned version of the directory.

Change-Id: Icaa41a38d6608ba364fcb0e01cc9eb1db99470ac
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

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

We need to check the list of the options dialog not the one in the
QtVersionManager

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

Restore selection and cursor position (may have been changed externally)
before any text processing.

Change-Id: I424523512f8f83c276e7d29760aad29bf7921dab
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ibc00ed4cbc54fc78fa815277387c01a3436cc688
Reviewed-by: hjk <qthjk@ovi.com>

Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80

This facilitates a consistent mechanism for not repeating messages

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

Otherwise one had to close and reopen Qt Creator.

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

As good as I could get it in 30 minutes.

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

We cannot know which module translation files might be needed, so simply
copy all .qm files in Qt's translation directory.

Task-number: QTCREATORBUG-8448
Change-Id: If359f1af67d093c3eeb42855877622b3416a3f41
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

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

This is basically about the git page, but the others have similar
controls.
I'd actually like to get rid of the gitk and repository browser boxes,
but don't want to change too many strings for 2.6.1.

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

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

Only show those kits with Qt versions

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

Do not use the Clocks example in the tutorial for building
and running, because it is not delivered with Qt 5.

Change-Id: Id3a81cf0ef01d05de1e287ac1e12cc07bdacbaf1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Task-number: QTCREATORBUG-7797
Change-Id: Icddb58db27f871c82468bf3a77bedc152ddf29cc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

That works around an issue with name collision pages in qdoc from Qt5.

Task-number: QTCREATORBUG-8415
Change-Id: I289a80174b006424d54f98410b2635a27258e368
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

On updating the working directory ensure that changes triggered from
the cmakerunconfiguration are not interpreted as the user changing.

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

Change-Id: I26d227464ae25edf92dc06f1c43cd0188b084132
Reviewed-by: hjk <qthjk@ovi.com>

With Qt5, qdoc finds the doc/api/*.qdoc files if the examplesdir points
to doc/, leading to the two toplevel index.html files ending up within
qtcreator.qch

Change-Id: I4ac3c1447c6924c4e292024919d52ddb97e1f8cc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

With Qt5 qmlpuppet needs to find a platform plugin.

Task-number: QTCREATORBUG-8447
Change-Id: I701d17da7f68dfcdfaeda171e2421488462692eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Task-number: QTCREATORBUG-8345

Change-Id: I83308e07fede50b74e4c806ea970953518269967
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

The current logic was broken (tried to search the qml files in the
root directory). Anyhow, there's no Android port of Qt 5 yet, so
let's keep it out for now.

Change-Id: Id854a6af00a15e424a79f903ea1d9272a89a66fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

For example in Russian for step name used noun but for action - verb.

Change-Id: I7396b386f5384d6838a83645c31aaffaa88ebe90
Reviewed-by: Viktor Ostashevskiy <ostash@ostash.kiev.ua>
Reviewed-by: Pavel Fric
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

I removed the Qt SDK 1.1 and some other outdated videos.
I added new videos from Qt Developer Days 2011/2012.
I also had to add icons new for Developer Days 2011/2012.

Removed videos:
Qt Creator! Getting the most...
Qt Quick Components
SDK 1.1 videos

New videos:
2012
What's New in QtWebKit in 5.0
Creator 101
Qt 5 Roadmap
QML Coding, Performance and Debugging: Usage of Tools

2011
Qt and Qt Quick
Qt Quick Best Practices and Design Patterns
What’s new in QtQuick 2.0


Task-number: QTCREATORBUG-8432
Change-Id: I5cf2a981d156a6825cda97e9bc7729b73c7350da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

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

Make the warning label italic, so it still stands out a bit.

Task-number: QTCREATORBUG-8345
Change-Id: Ia8cb4a45817e314411b326ca9e1929e5dbe85f76
Reviewed-by: hjk <qthjk@ovi.com>

Task-number: QTCREATORBUG-8345

Change-Id: I68f7ce5af2d3042366905e7bccfb6204a4d2808d
Reviewed-by: hjk <qthjk@ovi.com>

Fix "SOFT ASSERT: str && *str" when using the analyzer for the
first time / with nuked settings.

Change-Id: Id6f0fc8031fc8d8a24d6d4c0badfbfbdc98974a9
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I37c628ea18663eb8fec5351e3b2d580617ff7c35
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ibb355923f71a9c9a387edecb8e67760561b13117
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Iaf3eaf2b98bba6f1796a59499136e92c4124ad0b
Reviewed-by: hjk <qthjk@ovi.com>

When making a case insensitive search, try to keep the string capitalization when doing
the replace:
      - All upper-case matches are replaced with the upper-case new	text.
      - All lower-case matches are replaced with the lower-case new text.
      - Capitalized matches are replace with the capitalized new text.
      - Other matches are replaced with the new text as provided.

Note: this does not work with regexp replace, only plain text.

Change-Id: I87cbc28eb64688bdf3c8c6ec173fcb22f91abcd0
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68

Debugger display in separate windows currently opens several
widgets without title at the same location that disappear
below the main window when stepping.

Put them in a tabwidget and raise it when setting new values.

Task-number: QTCREATORBUG-8344
Change-Id: Icb6dd8942ab851aeeb6a9248c4a1360e8841cf61
Reviewed-by: hjk <qthjk@ovi.com>

Paths in the .includes file are user edited and may contain trailing
slashes.
If these are not filtered out, the CppCompletionAssistProcessor
suggestions are missing the first character (e.g. rc/, not src/).

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

Keep settings not found in the SDK-installed kit as seen in the
user-specific settings, but use the SDK settings for everything
else.

Downside: The compilers might change if you have several compilers
supporting the same ABI.

Change-Id: I71a0935cc180149b333ec38a03bd2556892c49cc
Tasknumber: QTCREATORBUG-8390
Reviewed-by: Daniel Teske <daniel.teske@digia.com>