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

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

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

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

Change-Id: I5bfbe8cf36556cceec02011012d2d1c09d0c0ebc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

All existing wizards derived from AbstractMobileWizard do not support qt
5. So they won't offer them, nor default to them.

Task-number: QTCREATORBUG-6321
Change-Id: I999e2565cec5b0d7da04c10e38ac2cb101352e5b
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

Change-Id: Ifd06745ec823d09ae7b42318d418fa1adb01824b
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

Change-Id: I192c8f218371bd45c5bc2ae2cbb1b4464b7f0956
Reviewed-by: Bill King <bill.king@nokia.com>

Change-Id: Iee0a01491075e1e82c17211b5e119bd5e167763b
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>

* Use '// @disable M123' to suppress
* Add quick fix to add these comments

Change-Id: I499f5a6004148afbb346218c6fb01c9ca77b9f73
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

Change-Id: Ie8b1624abfd9faa8c6153ad99e48964d597d543c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

Change-Id: I79c5c4db78eb96eda7c6f5d543bb5063d5670968
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

Change-Id: I02803ed9f131ded8748c526e88ca9825944e7057
Merge-request: 408
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Id7b8fba6707b1eaabf8065854f357cf600c809c5
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Change-Id: Ic79745eefbf37e42d4dd42e73d3752bed34bbfa9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

Change-Id: I5ab50b586109a9736cda48245807571ce10dfb5b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

Change-Id: I046c3a843c9a77ccb1c0f6569220d1c7497d26f4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

This reverts commit bcfa5753620df669860e53f63eb0a3b38e021574

Change-Id: Ia9042e90333a51c62f52cfb7a8660dd747dae393
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: If871c83b4ba2346f7eb343a7391a2972018445d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Correct exports, fixed commented out ifdef, moved socket including to a separate header.

Change-Id: Iadb6f58e2c3dbadee411fc0df7c7519c1d90309d
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Change-Id: Ie70fe778611bf4e6d48ed7e7e766dac4daf1eef2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

To distinguish known-to-be-undefined from a genuinely unknown value.

Change-Id: I606b4ea4d726f94553400b8950d3c0a4e76564a8
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

Only <Ins> should switch to overwrite mode.
<S-Ins> is supposed to paste text.

Change-Id: I66dd94d210488312a222a408cddb793451d14580
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Allows zeroconf to work also on ubuntu/linux in a network where there
is a local domain (like nokia).
This code is taken with as little changes as possible (to ease merge)
from apple mDNSResponder 320.5 (thus it does not respect Qt code guidelines)

Change-Id: Ic68ec3970ee9d6b02d2dc7cfb0ae1fbaf5a95bef
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

* supports avahi through its native interface
* starts embedded deamon if found
* tested all fallbacks on ubuntu
* Service is a normal object now
* several smaller improvements
Change-Id: I36288ec6fcefb64a60b6284e4d86d4b589ba37b5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Change-Id: I323798b47d5f7fcdf8ad70ee3def89814a6522e9
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

This fixes the encoding related issue below and also makes the code cleaner.

Task-number: QTCREATORBUG-6147
Change-Id: Ia61815217433da327206590b515e10d654bcc03f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

    width: {
    }

should not trigger a warning. We now only warn if { and } are
on the same line.

Change-Id: I45fa846ff63d0a83de782c412212165845c07e72
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

Conflicts:
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af

Show Address column in stack window only if explicitly enabled.
The address column is hidden by default.

Change-Id: I4e4b019dbcde1c2edb9fb3012831eee5054a8a22
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

This reverts commit fe80df7e.

With the above commit, Creator could not be compiled with MSVC 2008.

Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: I1519a7df87eb8d6f499fcfd789eebb6aaa8cf58c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

The file path from the device is already absolute, no need to add
another slash.

Change-Id: I591eb5ffee38bcea28564dcdc20541ee40f306a8
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Change-Id: If9f4918a77c874c82fec63eacf1464b78b5d82ac
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Change-Id: Id3c6a0eaa90096f2a7a0bdcfac10644e10e8858c
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32

Change-Id: Ic59098bbe57c90359d0bf7df8e3b8639a3aaf2d8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

E.g. breakpoints on QML bindings do not have an annotated function.
Still they're valid stack frames you can click on.

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

Avoid inserting characters that are already there.
e.g.
int testFly() {}
te|Fly()
When triggers a completion, the code will changed to:
testFly()|
But in before, the code will changed to:
testFly()|Fly()

Notice:  Character of '|' show the cursor position.

Change-Id: I6c111e30356b2549aebc6fbea05608e70d6ab41f
Merge-request: 398
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>