Commit Graph

1898 Commits

Author SHA1 Message Date
Alessandro Portale
8606345a66 Android Settings: Download buttons for Android Toolkit parts
Show little toolButtons next to the path input fields for SDK,
NDK, Ant and OpenJDK. The latter two only for Windows. These
buttons open the system Web browser with the according download
page.

We hope this saves the user a bit of time understanding what to
download where when setting up an Android development environ-
ment.

The download icon was drawn by me.

Change-Id: I0079059deca8d0f07d53b914900cb34b8f0489e0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-18 20:40:03 +01:00
Robert Loehning
d20f7a36d4 Use native labels for "Browse" button
Not worth the effort of introducing a PathChooser here.

Change-Id: I146058da3d1bdad776c943bf15b2373d62903987
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-18 14:08:43 +01:00
Daniel Teske
fac46592c3 Android: Add Java file wizard
Task-number: QTCREATORBUG-11220
Change-Id: I01967ce9bd205ccbeb93696b98e9b8d9228617f3
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-02-18 13:50:29 +01:00
Daniel Teske
30caf88a58 AndroidRunner: Handle incomplete lines better
Task-number: QTCREATORBUG-11472
Change-Id: If2479d3ccb85857a8775894b1f4088702578ecba
Reviewed-by: jian liang <jianliang79@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-14 15:22:08 +01:00
Tobias Hunger
8c1c284789 Qbs/qmake: Fix dependencies of plugins
... based on output from dependencyinfo.py script

Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 13:23:26 +01:00
Daniel Teske
25e206f59a AndroidSettingsDialog: Don't clear sdk/ndk setting on canceling browse
Task-number: QTCREATORBUG-11410
Change-Id: I0efc6521d2e00597b45080455d03e83b3966f103
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-02-11 11:38:01 +01:00
Tobias Hunger
a8ea31bf09 FileUtils: Add static method to construct FileNames from Latin1
Change-Id: Ida513eb0537e2ef0c55887d0df21de956e85e983
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-11 10:46:09 +01:00
Christian Kandeler
e24b5c17d6 Android: Remove unneeded include.
Change-Id: I47be2a7ba17c53054084e576f62ad163832f2940
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-05 11:33:33 +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
bbcd3046e5 Android: Fix listing of aliases in keystore
Task-number: QTCREATORBUG-11339
Change-Id: Id571813ae6c057b76a384c21a2330be908b3ba6e
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-01-29 15:51:46 +01:00
Eike Ziller
4eff289e03 TextEditors: Remove widget's setTabSettings method
Change-Id: If212b45e2d526534b7853f3fa23b170f61e1976e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-01-21 11:22:16 +01:00
Friedemann Kleint
7be1f1064e Android: Fix build with MSVC.
Change-Id: I392e3321c0f07b69f3ad67308483217071b35a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-01-21 10:24:44 +01:00
Daniel Teske
d1fd61cbf3 Android: Add minimal Java editing support
Indentation for blocks '{'. '}' and completion for keywords.

TODO: "New File" is missing,
TODO: probably needs some tweaks to the indentation.
Task-number: QTCREATORBUG-11220

Change-Id: I758b3815e47d1427d39c0248eb16e39ffb7a29fb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-01-20 14:57:04 +01:00
Daniel Teske
db5b959639 AndroidDebugSupport: Set more accurate so-libsearch path
Task-number: QTCREATORBUG-10382

Change-Id: I6c38fda8a4bf70ae93f6ec7dd671878589056124
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-17 14:28:59 +01:00
Daniel Teske
257c04b664 Android: Rework settings dialog
Make it possible to create multiple AndroidConfigs so that we can have
a different one in the settings dialog from the global one. Move pretty
much every method from AndroidConfigurations to AndroidConfig, so that
the settings dialog can work with its copy. Also add some additional
logic to the settings page around the java setting. To start the avd
manager we need both a sdk path and a java path. Also do some basic
additional checking of the java path.

Task-number: QTCREATORBUG-7724
Task-number: QTCREATORBUG-10936
Task-number: QTCREATORBUG-10937
Task-number: QTCREATORBUG-11059
Task-number: QTCREATORBUG-11218
Change-Id: I148c69b9c98a8a070d17d9b0e223d01db1750e69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-01-17 13:01:22 +01:00
Eike Ziller
bdbf60876f AndroidManifestEditor: Be less noisy with changed() signals
Changed signal shouldn't be sent on all contents changes, but only if
the modification state changes.

Change-Id: I2fda12b5ded56eac4eec8cf6a428c04b18b576ec
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-01-16 08:54:43 +01:00
Eike Ziller
a1006d107f Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2014-01-15 14:05:04 +01:00
Eike Ziller
851f255b9d Merge remote-tracking branch 'origin/3.0'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
2014-01-15 14:04:41 +01:00
Daniel Teske
83c3b6c20a Line locator: Also work with editors that are derived from IEditor
IEditor has a concept of line and column number and goto line, thus this
can be done.

Change-Id: Ic2e3bdcfa2b1debf102afc21bfe9be667a0264c8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-15 14:03:09 +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
Thiago Macieira
58a4e601ff Fix change-of-sign warning found by ICC
-1 is not a valid unsigned value.

registerhandler.cpp(354): warning #68: integer conversion resulted in a change of sign
          return createIndex(row, col, TopLevelId);
                                       ^

Change-Id: I41935255704f19724d6cec16ea470e2f8f8a16a1
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-10 15:40:22 +01:00
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
Daniel Teske
498d198104 Android: JavaParser, adjust paths from build to source directory
Since we copy the java files to the build directory, we need to adjust
the path that the java compiler emits for error messages.

For that the JavaParser needs to know the source directory, which is
the android package source dir and the build directory. The
AndroidDeployQtStep thus needs more information then just the
input json file and now stores the path to the .pro file to both
retrieve the input file and the android package source directory.

Task-number: QTCREATORBUG-10904
Change-Id: Ib5141b35b610bc2eee568a096fc5e930f9eb2e47
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-01-10 12:35:19 +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
Daniel Teske
5fb2f2d652 Utils::FileName: Rename append to appendString()
The function's operation of simply appending the string as is would be
fine if FileNames were strings. But they aren't, so the function name
should be intentionally ugly to stand out.

Change-Id: I85e16844e2d69cacb6566c538182b84300c45161
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-01-09 14:14:03 +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
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
hjk
bad8a451a6 Debugger: Remove support for non-Python GDB
This affects mainly Apple's version of GDB. Mac users are advised to
use LLDB, or some recent build of FSF GDB.

Change-Id: I6a7fbb591e79f737e12d08b0e881e9e4d1d9660c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-01-06 15:41:16 +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
e035ae6df1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
2013-12-18 11:02:16 +01:00
Eskil Abrahamsen Blomfeldt
4b40cda342 Android: Fix build path with non-latin characters
androiddeployqt uses toLocal8Bit() to get the correct
encoding for executing shell commands, which is broken when
Creator sets the process locale to something different from
the shell. This caused build failures for all users on systems
where the default build path is translated to something which
contains non-latin characters.

Task-number: QTBUG-34316
Change-Id: I4e7dd0d3351d164b720f042bb21f668589df5527
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-12-17 15:09:49 +01:00
Daniel Teske
6f01f73b86 Android: Increase timeouts for keytool
Such a long timeout isn't nice since this is run in the gui thread.
But better than failing and typically it shouldn't need to block for
4s.

Task-number: QTCREATORBUG-10944
Change-Id: I1d3f842de8119603fa165878a14afc96a04c0c2a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-16 11:49:53 +01:00
Eike Ziller
d80fb696ab Give TextEditorActionHandler an explicit parent and unify usage.
The action handler implicitly passed ownership to ICore, which is non-
to the action handler. We now consistently create the action handler in
the editor factory, give ownership to the editor factory, and don't hold
a reference to it.

Change-Id: I4372f8de966e3ceff87c06c5528c6b54522c1d57
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-12-12 09:59:55 +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
deb43b4c8a Preferences: Add default implementation for filtering
The default "matches" method now takes the widget and looks for all
child labels, checkboxes, push buttons and group boxes.
Because of that, the former "createWidget" method
can be called multiple times without creating a new widget
(-->widget()), and the "finished" method must ensure that the created
widget gets deleted, since not all widgets that were created are added
to the UI anymore.

Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-10 13:31:48 +01:00
Thiago Macieira
817f99d3ee Fix abuse of QProcess::error
It's invalid to call it if no previous function returned an error. Don't
rely on undefined behavior. Instead, simply check if waitForFinished()
returned false, which is what this code intended to do anyway.

Change-Id: I67903ba65e86ff1d1810481b2bd5724ab99a4b76
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-12-06 22:05:58 +01:00
Eike Ziller
072d551c73 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
2013-12-05 11:58:42 +01:00
Daniel Teske
edf42d55d7 Android: Fix restoring of MakeExtraSearchDirectory
Task-number: QTCREATORBUG-10983
Change-Id: I73dbc3e5279db8d85954d15411b68c47a038bafb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-04 17:39:52 +01:00
Daniel Teske
0bb684345d Android: Rename target sdk to build sdk in the deploysetttings
Change-Id: Ie1e6d02f29d236da9502c03d0e7fa7e745df8f7d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-12-03 13:37:34 +01:00
Daniel Teske
7d266c648e Android: Remove one Android in "Android AVD" text
Task-number: QTCREATORBUG-10938
Change-Id: I93e471730067b89447b840b309ae2769eb80c1ce
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-11-28 14:59:06 +01:00
Eike Ziller
baf190ff4a Merge remote-tracking branch 'origin/3.0' 2013-11-27 12:18:12 +01:00
Daniel Teske
e93b59ca12 Android: Show output of android create avd
The output is shown in the general message pane. Which is rather
suboptimal since both ways to create avds are via a modal dialog, thus
the output is not even accessible  easily. So far no one has reported
issues with failed avd creation. In case someone does, we now have the
output of the command.

Task-number: QTCREATORBUG-10601
Change-Id: I41c68d48fd317cd0e892a5ab3f5e2a5fa4bcbae9
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-11-26 11:43:20 +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
Daniel Teske
54636d9756 Android: Remove various waitForFinished(-1)
That waits forever. For processes that should finish in a reasonable
time, we should not wait forever. I changed most of the waits to 5s,
all of those functions do handle a failed waitForFinished. I doubt
that all callers do also handle it correctly, but that's probably
still better than waiting forever.

Task-number: QTCREATORBUG-10868
Change-Id: I368a911f19a4f81d71b24cf9d58796bd99878040
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-22 12:03:55 +01:00
Eike Ziller
559e66cb35 Merge remote-tracking branch 'origin/3.0' 2013-11-22 09:11:51 +01:00
Daniel Teske
cf5ec760f6 Android: Give Create Avd dialog a proper parent
Change-Id: I0e57d83526dff0edb435f9d81b18e22d4ee26e08
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-11-21 18:27:36 +01:00
Daniel Teske
ee909267e0 Android: Give AndroidDeviceDialog a parent
Change-Id: Ia5b4f9a1be705dd2b6a0a5ae1f5d44f272973c17
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-11-21 18:10:50 +01:00
Daniel Teske
25f69fa542 Android: Fix sign package behavior
Ensure that the widget and the step's settings are in sync with each
other. Also don't restore the sign state since that leads to a password
prompt on restoring the project.

Task-number: QTCREATORBUG-10835
Change-Id: I4c3ead74e8caa6c87096c13173530a9c8ccae6aa
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-21 13:31:44 +01:00