Commit Graph

13 Commits

Author SHA1 Message Date
Daniel Teske
590c033b36 Android: Add a checkbox for "Default Qt module permissions"
Task-number: QTCREATORBUG-11528
Change-Id: Id4e7f8c0ca4b060c5accf5f6f3b1ab2071ca408e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-18 13:26:13 +01:00
Daniel Teske
de8b860441 AndroidManifestEditor: Rewrite writing of xml files
Using QXmlStreamWriter + QXmlStreamReader gives us greater control
over the ordering of attributes. That way we can ensure that we never
change the ordering that the user used. (Whereas for QDom the best
we can do is to have a predictable but random order.)

Neither QXmlStreamWriter nor QDom allows us to control the indentation
and other whitespace, so any user indentation is lost.

In addtion QXmlStreamWriter seems to have several bugs with indentation
though, leading to rather strangely formatted files.

Task-number: QTCREATORBUG-10870

Change-Id: I4cdbdcd499227f418e7767eb1b532efbbd5083a5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-12 10:45:34 +01:00
Daniel Teske
c0dda8b2bb AndroidManifestEditor: Make widget better at resizing to small sizes
Task-number: QTCREATORBUG-11394
Change-Id: If2c18df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-04 13:23:46 +01:00
Daniel Teske
e485b439bc AndroidManifestEditor: Fix widget hierarchy
Since TextEditorActionHandler has now a virtual function, we can
do a less fancy hierarchy for the AndroidManifestEditor and thus fix

Task-number: QTCREATORBUG-10597
Task-number: QTCREATORBUG-11163

Change-Id: I6c4014ae03b66f0639f8c8973763d690fb062cc4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-15 13:59:47 +01:00
Eike Ziller
f9ce335a6d Editors: Remove useless parent widget argument from create/duplicate
It was never called with a sensible value anyhow, and only complicates things.

Change-Id: I005848700b6c00114d91495670d4a0e15a2d2e64
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-08 11:46:11 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Eike Ziller
3d1b70c58e Remove the need to register editors in the action handler
The action handler already knows which editors to handle through the
context. It only needs to receive signals for updating the actions from
the current editor. So there is no need to tell the action handler about
every individual editor. This also removes some noise from the text
editor implementations.

Change-Id: I76dc5b1559cc8cf54ff313e6cdba4e789a3108aa
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-12-12 09:59:27 +01:00
Daniel Teske
e7778d1470 AndroidManifestEditor: Cope with non existing strings.xml
Instead of retrieving the app_name from the strings.xml simply show the
reference to the strings.xml file.

Task-number: QTCREATORBUG-10821
Change-Id: I99bf45df4864857992d03746cf8613b6f097352d
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-11-26 11:43:02 +01:00
Tobias Hunger
8d7bd37bbe Android: Remove unnecessary member
Change-Id: I68f6f7f4a14d7d36ef18d2db354704309fbb0bf4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-10 16:18:14 +02:00
Daniel Teske
6c582e0180 Android Manifest Editor: Show available targets in combobox
Task-number: QTCREATORBUG-9682
Change-Id: I0454d96ff0a1df370e0b9197ae536bf5ae632ac2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-08-30 12:05:04 +02:00
Daniel Teske
3c2facab5f Android Manifest Editor: Add support for minimum and target sdk settings
Task-number: QTCREATORBUG-9692

Change-Id: Ide85392d86e7f3df4df9644f01d186ed939f5124
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 15:06:25 +02:00
Daniel Teske
60b1aaeae4 Android: Implement a "editor" for android manifest files
Change-Id: I18c00ab452db21e5aa1ae3ad2eff465cfeff54b6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-15 16:16:55 +02:00