Commit Graph

4 Commits

Author SHA1 Message Date
Eike Ziller
d9d0aba1c4 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
2014-08-15 16:14:34 +02:00
Samuel Gaist
22fe880628 Improve AndroidManifest.xml error dialog content
Currently, if the AndroidManifest.xml file is not present in the
installation folder (e.g. failed make install), the error message
shown to the user just tells him that some operation failed. This patch
tries to be more verbose to give the user some clues for the failure
reason.

Task-number: QTCREATORBUG-11503
Change-Id: I013de394c87b3adb53ec86dd97433567d7f63049
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-30 17:38:17 +02:00
BogDan Vatra
3df9c66753 Android: Remove more dead code
Change-Id: Ibaabebb99bd4b92a429c1114b7a0bf4689aa5610
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-24 12:18:49 +02:00
Daniel Teske
7c99512260 Introduce QmakeAndroidSupport plugin
Holds androd + qmake related classes

Change-Id: Ib6bbc9c77a2b5f014573a1aa343dff5741abdb26
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-24 10:46:18 +02:00