Change-Id: Ia641c70f8c72cf762cf571cdd505385d28492b7c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

Conflicts:
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppquickfix_test.cpp
	src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: I392229af933c1e56b9ea459d4d240a2144b4bfcb

${var} has been replaced with %{var} since 2.2

Change-Id: Ifecd94fb68b8f7dfb4b4f56736d8c317cd6d41a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Change-Id: I7bd6649dd20b0b204b7a4f4bcbcee6bc45fa0272
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

Git commit dialog: Added a drop-down menu to the commit button to
execute "git push" or open the "Push to Gerrit" dialog directly after
a commit or amend.

Task-number: QTCREATORBUG-8854
Change-Id: I00ff8f816d1768e0cdaf6929126b55826788e578
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Rewrites post increment/decrement operators (++ and --) as pre
increment/decrement operators and moves non string/numeric literals and
non id expressions from loops condition to loops initializer.

Change-Id: Id95334b6df6fcaa9af436cc1d2d0982d38bf8fe2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Those should be added once at initialization time, not for each
setupWidget call.

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

Feels better that way.

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

To prevent to have a puppet in qt which is selected first.

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

Otherwise it is so easy to use a old puppet.

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

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

Use the diff switcher state as a permanent setting

Change-Id: I6c3669090082787ae750596cf3e62973c04d94c3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

It is very common to have output from a previous (longer) command appear
instead of the newly created one.

For example: Open a log. Check "Show Diff" and immediately uncheck it.
If this is done fast enough (or with a high Log Count limit) the output
with the diff will appear instead of the normal log.

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

If the user cancels a command, output and error text might still be
interesting. When aborting a command internally (when Creator is closed,
or later when a command is re-executed for the same editor), we don't
want any of those, and they have a destructive potential.

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

Also add in Projects view

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

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

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

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

Adds macx-ios-clang to the list of "suggested" mkspecs for Clang/Mac.

Change-Id: I3c3f803d651c42e1c2ed7a0f77047a531acf6a0c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Such that QLayout properly handles it. Fixes warnings about
resizing violating size constraints on Windows.

Task-number: QTCREATORBUG-10251

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

Starting with commit 243a6259 EditorManager::closeEditors() does not
delete the editors anymore, but calls deleteLater(). When the call
returns, all kind of checks fail since the editor widget destructor was
not yet called.

Fixed by providing and calling Core::Tests::closeAndDeleteEditors(),
which explicitly sends QEvent::DeferredDelete to the widget.

Change-Id: I3287abbe74ccf7d7a18b997a847701c8be17cb55
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

fakevimhandler.cpp:941:43: warning: comparison of integers of different signs: 'Int' (aka 'unsigned int') and 'int' [-Wsign-compare]
        return m_xkey == c && m_modifiers != int(HostOsInfo::controlModifier());
                                      ~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

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

Task-number: QTCREATORBUG-10257

Change-Id: If12f3ee18dda18da13fe2ea39af42cae4fe21ddf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Prevent creation of native windows for subwidgets, caused
by the welcome screen.

Task-number: QTCREATORBUG-10251

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

symbolgroupnode.obj:-1: error: LNK2019: unresolved external symbol
"char const * const stdWStringWCharTypeC" (?stdWStringWCharTypeC@@3PBDB)
referenced in function "public: static class std::map<class std::basic_string
<char,struct std::char_traits<char>,class std::allocator<char> >,int,
struct std::less<class std::basic_string<char,struct std::char_traits<char>,
class std::allocator<char> > >,class std::allocator<struct std::pair<class std::basic_string
<char,struct std::char_traits<char>,class std::allocator<char> > const ,int> > >
__cdecl DumpParameters::decodeFormatArgument(class std::basic_string<char,struct std::char_traits<char>,
class std::allocator<char> > const &,bool)"
(?decodeFormatArgument@DumpParameters@@SA?AV?$map@V?$basic_string@DU?$char_traits@D@std@@V?$
allocator@D@2@@std@@HU?$less@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$
allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@std@@@2@@
std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@_N@Z)

Change-Id: I64b1bc2b07df5da199a14c743f919fca4c0c22b3
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

BlackBerryDeviceConfiguration is using the same QnxDeviceProcessList
as QnxDeviceConfiguration.

Task-number: QTCREATORBUG-9976
Change-Id: Ic07297619d4d5d4280918df4e1ea21b958fd1050
Reviewed-by: Fanda Vacek <fvacek@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>

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

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

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

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

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

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

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

Valgrind doesn't work on Windows, and the compiler flags for those test
apps are incompatible with MSVC

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

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

Now it uses ProjectName:s and ProjectName:h so source code
is generated correctly.

Task-number: QTCREATORBUG-10227
Change-Id: Iecf5250e765def70d7a1d2833a02f3b2a7c3e863
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

Task-number: QTCREATORBUG-10228

Change-Id: I0660619b3279ff4889091c19622a98771c213a3e
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

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

Generalize the target setup page and move it into projectexplorer

Move the qmake specific code into a projectimporter class with
a specialization for qmake projects in the qt4projectmanager.

This change depends heavily on the BuildConfigurationFactory cleanups
done earlier and completes that change in such a way that generic
build configuration factories are now in theory possible. The
remaining problem is how to select the best factory of several that
claim to be able to handle a kit and that is left for the next patch.

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