feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
33,664 Commits 108 Branches 368 Tags
8ab5b7ec0bc10fc35651f3a1046b26d815c24810
Commit Graph

34 Commits

Author SHA1 Message Date
Eike Ziller
a3608f595a Editors: Remove BaseTextEditorWidget::setBaseTextDocument 
First step in never changing the text document after construction,
because that is actually not really supported.
Second step will be to fix that for the editor duplicate() methods too.

Change-Id: I3d112ba0895e7ee7ac6dd8ae2318f0de7d2cebc9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-01-10 14:31:11 +01:00
Eike Ziller
4ae7d5cd1b Manifest, pro file and CMake editor can have fixed mime type set 
Can be set directly from the document constructor, no need to do that
later.

Change-Id: I4326757e1b1cb1e48c157c4b330ccb2abb8f3b1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-01-09 14:45:14 +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
e793e2d830 Android: Remove unneeded casts. 
Change-Id: Ib3db0e830aeddbfbcf72d76f8f48eb8c7bb9933b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-01-07 09:37:01 +01:00
Eike Ziller
1adab4c4cc Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument() 
Doesn't really make sense to have the additional IDocument *editorDocument()
method.

Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-18 11:34:34 +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
Eike Ziller
baf190ff4a Merge remote-tracking branch 'origin/3.0' 2013-11-27 12:18:12 +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
Robert Loehning
72e81db349 Android: Add missing white space 
Change-Id: If0dace49b2fd353520f424d69d0bc72470e745c8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-11-18 18:36:18 +01:00
Tobias Hunger
62f056a29e AndroidManifestEditorWidget: Fix build using Qt 5.0 
QString::midRef is available in Qt 5.0, but QStringRef::toInt only was
added in 5.1.

Change-Id: I66666b00348c0535b4779206bd63e363f4b2c666
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-11-14 12:51:54 +01:00
Orgad Shaneh
4442a92729 Braces cleanup 
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-14 08:13:52 +01:00
hjk
d7d27fccbc Rename plugins/qt4projectmanager to qmakeprojectmanager 
This finally renames the plugin itself.

Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-29 17:57:06 +01:00
hjk
35695ebb0c Qt4ProjectManager: Rename the "normal" qt4* files to qmake* 
Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-10-16 14:30:05 +02: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
Friedemann Kleint
1010bd2924 Android: Fix compilation with Qt 4. 
Change-Id: I8f5e310f14159238079f30dded0e5f0814d20990
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-10 15:19:58 +02:00
Leena Miettinen
e902945b7e Android: fix UI text capitalization and punctuation 
Fix typos and style issues.

Change-Id: I8d1bbccd55e7558e7f8a8bedbab95f4bb8a8478f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 17:50:52 +02:00
Daniel Teske
37edb06c1e Android Manifest Editor: Fix various issues around min/target sdk level 
Change-Id: I9b9239055301296b572e0c36c40f179b0e98c67d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-10-09 15:38:40 +02:00
Friedemann Kleint
a833ba350a Fix some spelling/tr-errors in Android/QNX. 
Change-Id: Ia9f927c7b4108046d03158de0aa6d94026f1cfde
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-08 15:24:13 +02:00
Daniel Teske
71d6b2b10d Android Manifest Editor: Eat keyboard events 
And thus prevent them from affecting the wrong widget

Change-Id: Iacf326630a80c2d53e8852ea8055d7bd5f87ed68
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-02 15:16:17 +02:00
hjk
aadb6f16af SessionManager: Apply 'static' pattern 
Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-09-05 12:28:12 +02:00
Tobias Hunger
a82654a485 Android: Remove some Android namespace usages 
Change-Id: I74df950ff9de6ddc639a4b32bec55c269b5fb0e1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-09-03 16:18:26 +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
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath 
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-09 13:51:42 +02:00
Robert Loehning
5ee8650eb4 Fixed missing white space 
Change-Id: I6d584fc24bbce4ff9eec2dd8f7d23b0124b1a1f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-06-12 18:55:37 +02:00
Robert Loehning
5bb09d23db String fix 
Change-Id: I7052e3d5125e79c50a94e0ef602aa528f949851e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-06-12 17:35:48 +02:00
Daniel Teske
60cd9882f0 Android Permission update 
Task-number: QTCREATORBUG-9277

Change-Id: I2c52b4ad66e2c04f427c2bfdc0bde4df55cefd96
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-05-28 15:26:05 +02:00
Daniel Teske
6622aa91ce AndroidManifestEditor: Use indent 4 for formatting source 
Change-Id: Iece75754acafda7c3bcaa8fe043a2aae98ef7e32
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-05-22 15:08:16 +02:00
Daniel Teske
942e415866 AndroidManifestEditor: Disable text actions if the editor is hidden 
Change-Id: Iac60829f9db5d425c70f7ff7a1124ec33f2d5173
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-05-22 15:08:11 +02:00
Daniel Teske
c58c33764e AndroidManifestEditor: Readd some tweaks from the .ui file 
Fx the version code spinbox being too big and readd some tooltips.k

Change-Id: I6e2e10d64d9616809f3b97c8c9a5d1e668c025ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-05-22 15:08:03 +02:00
Daniel Teske
bf1afce579 Andoid Manifest Editor: Adjust look to be more in line with a editor 
Use the same styling as e.g. the submit editor.

Change-Id: Idb396b6971f75d9f4a876edf992c917ee81820df
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-05-22 15:07:58 +02:00
Friedemann Kleint
b2c80665e8 Android compile fixes for Qt 4. 
Change-Id: I4620a0b8ff29dbb8a0d93f2fc90cc7984f49ed92
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-15 16:27:48 +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