Change-Id: I39be7c3fb9b57b133c4da3639813527aa280ae33
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

They're only used in gitclient.cpp, define them there

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

This accidentally also allows non-debug Qt users to reproduce the
http://blog.qt.digia.com/blog/2010/04/22/peek-and-poke-vol-3/


smiley drawing.

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

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

Task-number: QTCREATORBUG-9381

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

Task-number: QTCREATORBUG-9663

Change-Id: I18b4ec5577bf0114075141583c938eaa02d5eded
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Task-number: QTCREATORBUG-9530

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

* Empty environment should be ignored when comparing to current one
* Fixes superfluous warning when opening a .user file without environmentId

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

If directory is empty, buttons remains NULL, which leads to a crash

To reproduce, open Branches dialog then close all editors
and projects and click Log for a branch

Change-Id: Icf06b76c58585c0dd6062017e94e07dad016c275
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

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

If you had typed "filename.cpp:142" in the Locator field, Creator
would offer "Column 142" the first option. At the very least, that's
confusing because the user intended to select line 142, not column --
for a while I thought someone had typed the wrong word in the source
code.

But even worse, this selection was the first entry, so instead of
jumping to filename.cpp on line 142, the user ended up still on the
same file and line, but on a different column.

Instead, simply validate that the parts before and after the colon are
actually numbers.

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

... when the symbol was added as an expression.

It seems that calling GetSymbolTypeName somehow destroys the red-black tree,
so moved the call before creating the tree.

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

When a second project was opened the snapshot was reset. That resulted
in all kinds of problems since from then on the code model effectively
was not aware of the files of the first project.

The regression was introduced by commit a0d6df7b.

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

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

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

The Info.plist.in files are actually handled by static.pro.
The projects should only be compiled from the deployed sources in the
build tree.

This reverts commit 30c602f4.

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

When qml(2)puppet is built as part of Qt Creator, we need to generate
the Info.plist from Info.plist.in. When it is deployed as source into
the Qt Creator build, we need to do that too.

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

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

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

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

In debugger.pro, take path that checks and sets
QMAKE_CHK_EXISTS_GLUE if QMAKE_SH isn't empty.

Change-Id: I7c37acc5867c1ac3ab6da33db3eb2479c1d4213c
Reviewed-by: Alexey Pavlov <alexey.pawlow@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

It's been fixed.

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

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

Change-Id: Ib34a474344d3077096c9775d1c5b99f59ae3e4fa
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

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

Change-Id: Ie1ca69582cfd8893b0616e51d2d5c1b13e987b69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

* targetOS for mac is "osx"
* targetOS and toolchain are lists

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

Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Change-Id: Id54a06a6636588a029de2e2f72d50edcf7ceaaa3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

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

Conflicts:
	src/libs/cplusplus/LookupContext.cpp
	src/plugins/plugins.pro
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qnx/qnx_dependencies.pri

Change-Id: I6c406c2503845b08c4852db99c64491a325629c7

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

Task-number: QTCREATORBUG-9656

Change-Id: If8babdb942830bd11fe360a311c57b75312248be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>

Required when ptrace_scope is set to 1 (default on recent debian and
ubuntu)

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

Linguist seems to escape the escaped HTML twice.
This breaks  translations.

Task-number: QTCREATORBUG-8923
Change-Id: I820b89d7c8e140115dc8b2cf8ef28db49cfb7102
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a

Task-number: QTCREATORBUG-9424

Change-Id: Iba4a9663a8fa39160f1953366ae4aa64d5f586ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Executable can be non-absolute

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

Task-number: QTCREATORBUG-9643

Change-Id: Ia0a2427a186fd9ad24e1cf620df48be13032a69b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

The slot CPPEditorWidget::onContentsChanged() was still connected to the
initial QTextDocument of BaseTextEditorWidgetPrivate and not to the via
BaseTextEditorWidget::duplicateFrom() updated QTextDocument.

This fixes the visual appearance when renaming. The actual renaming
is/was not affected.

Task-number: QTCREATORBUG-9651
Change-Id: Id26dc11627c253bbf89904be3f3df21a45041d01
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>