Commit Graph

163 Commits

Author SHA1 Message Date
Daniel Teske
677746cd82 Android: Warn about broken gdbs on every platform
Add more indicators for a broken gdb. This also fixes a bug where the
message was errounously shown on non-OS X platforms

Task-number: QTCREATORBUG-12747
Change-Id: I7936e5eea58896aec382616d6e7236b8276f998d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-29 16:25:35 +02:00
Daniel Teske
06bb01249b Android: Check for broken gdb on mac
Task-number: QTCREATORBUG-12636

Change-Id: Ib41db2607fef6291c1464e5ce2ea626fd86b3025
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-23 18:10:15 +02:00
Daniel Teske
c263b1cea8 Use PathChooser in AndroidSettingsWidget
Task-number: QTCREATORBUG-11500
Change-Id: I8e449cb3c89fc3474344b4f9959b567681a6ab1a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-06-05 13:46:40 +02:00
Daniel Teske
dad30a787d Android: Fix "OpenJDK" title in browse dialog for JDK path.
Task-number: QTCREATORBUG-9705
Change-Id: Ic0172f86020ff560dc51210a5dc8edb1be080517
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-06-04 18:36:56 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
2014-05-16 16:54:50 +02:00
Eike Ziller
e90b0c128e Android/Ant selection: Work around file dialog bug on Mac
Task-number: QTCREATORBUG-12184

Change-Id: I2cb7c1549fc2201d4fbe163eb321b0ef11cc8a06
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-12 12:12:45 +02:00
Daniel Teske
7a91287c80 Android: Fix blocking the ui on adding an avd
Task-number: QTCREATORBUG-10601
Change-Id: I3d1fef8a44f434f7eb484f538863c436b4e3a21c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-05-08 11:03:38 +02:00
Alessandro Portale
db03240b61 Android: Show all download buttons in settings on OSX
Only hide them for Linux.

Change-Id: I31bdfc0368d71556476911aa20431ed3ea220f6e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-07 14:32:45 +02:00
Daniel Teske
04c9809e9f AndroidAvdModel: Code cosmetics, make ::avdName const
Change-Id: I3b5ea968732cf3b69d37e6bc4c0bd514be1ceb05
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-04-14 12:02:46 +02:00
Daniel Teske
b70778387d Android: Add a message box to remove avd
Since it takes effect immediately.

Task-number: QTCREATORBUG-11994
Change-Id: I48d322195ac62036c4e6fabc61b57a434cbdb495
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-04-14 12:02:29 +02:00
Daniel Teske
41d3f0f2f2 AndroidSettingsDialog: Warn the user that spaces in the ndk path are bad
Task-number: QTCREATORBUG-11629
Change-Id: I576940fa5ac3fd47376cf3fc700689e1046387b0
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-18 17:11:01 +01:00
Daniel Teske
c751e2d685 AndroidSettingsDialog: Fix kitWarning icon showing up wrongly
Change-Id: I619c858d9a379ee8b1463c048a8c34950ac25bc7
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-18 17:10:56 +01:00
Alessandro Portale
388dc9947a Android options: Stronger check for valid JDK location
The location should contain bin/javac

Change-Id: If67ed4902b817f2d07302afb195e6dfbad881250
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-12 11:17:26 +01:00
Alessandro Portale
3affbed2b6 Android: Fix parameters for the Ant script file dialog
Making sure that the file name field has "ant.bat" set, and
that the filtering really works.

This patch also ensures that native file separators are shown.

Task-Number: QTCREATORBUG-11628
Change-Id: Ibab8c145d0b832e5ad2e2ff62a81818e4044f13e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-05 12:41:57 +01:00
Alessandro Portale
c1b2ed036f Android: More accurate Android Sdk location error messages
If the user installs a fresh Android SDK and selects its path in
the Android options, Qt Creator will still say that this is not
a valid Android SDK.

The reason is that Qt Creator also checks for the platform tools
to be installed. Installing those is a separate step which needs
to be done after installing the SDK.

This patch enables Qt Creator to tell the user if the platform
tools are missing, but the SDK is otherwise fine.

Change-Id: I3557fb93d46e8677498843250302d12c8babb1df
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-05 12:18:31 +01:00
Robert Loehning
8d238af564 Use native labels for "Browse" buttons
Change-Id: Idee0525ccd69c64856d0f4b7b3bab1252e573280
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-03 13:00:25 +01:00
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
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
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
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
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
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
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
5e1d6fcfe8 Android Settings: Fix crash on clicking remove avd twice
Task-number: QTCREATORBUG-10848
Change-Id: Iea0a815530f8a07c07f4b1562fc7189aadc85ab8
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-11-20 18:04:14 +01:00
Daniel Teske
721d6546a6 Android: android.bat needs a special environment
See the below task for details:

Task-number: QTCREATORBUG-10575
Change-Id: I7756d8780b33ede4c3d4eac7e281c9eabfa47e35
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-19 18:21:33 +01:00
Daniel Teske
899dac18f7 Android: Don't search for ant.bat on linux
Change-Id: Ia149f8eed040d5fe370286025cf76f7a6e7f47db
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2013-11-15 17:44:10 +01:00
Daniel Teske
82f7f67ddc Android Settings Page: Disable avd settings if no sdk is configured
Task-number: QTCREATORBUG-10719
Change-Id: Icba278610119a204b19b0422bfa778d9a2c71d86
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-11 13:30:33 +01:00
Daniel Teske
c07f6d3c82 Android: Fix double slash in ndk's ant autodetection
Just use Utils::FileName, it magically does the right thing. :)

Task-number: QTCREATORBUG-10542
Change-Id: Id0d508c1e7d9317fa2e4a56ae9389e909c0c3834
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-31 12:48:30 +01:00
Daniel Teske
6bd08800d7 Android: Fix crash if avds cpu's could not be determined
That can happen on strange setups with multiple avds

Task-number: QTCREATORBUG-10362
Change-Id: Ib6fef4ee3538632c2c71264d6a6c43e3bd917c69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-15 13:45:52 +02:00
hjk
0ed9b97a1f QtVersionManager et al: Code cosmetics
Apply static 'pattern' for QtVersionManager, de-noise using code.

Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:54:16 +02:00
Daniel Teske
480f7c09fc Android virtual devices: Fix starting a avd
This cleans up various bits of the avd support in Creator.
- Adds a abi combobox to the create avd dialog.
- Moves the startAvd code into a separate thread, so that
  starting a avd while deploying doesn't block creator anymore.
- Implements a better waitForAvd function that works even
  if a emulator is already running and accurately can
  detect that it has finished booting.

Note: There are still many problems in the avd support in creator.
- The "clean libs on device" and "install qasi" functionality block
  the gui thread if they are run on a avd.
- If no avd exists and no suitable hardware is attached, the user gets
  a create Avd dialog, which doesn't tell him why he needs to create a
  avd. That information is hidden in the compile output.

Still this fixes the main use case of hitting run on a newly created
project with no actual device attached.

Change-Id: I76b3fdb1bdf3eadac07f82ad7d145ce6af453326
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-08-19 12:58:49 +02:00
Daniel Teske
b2a048b02f Android: Hide warning icon for sdk if the setting is empty
Change-Id: Idf86cbf8679afcd6054c1f191619a44b576c6f45
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-02 12:55:06 +02:00
Daniel Teske
65c2930c06 Android: JDK location is a directory, use correct file chooser dialog
Task-number: QTCREATORBUG-9706
Change-Id: I0a1892eb94024529cf450926dee22e629ef85e0b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-07-09 12:00:08 +02:00
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Daniel Teske
5948bcf328 AndroidSettingsWidget: Don't show a message box for wrong settings
I believe this is responsible for the crash reported in
Task-number: QTCREATORBUG-9724

Change-Id: Id5721e46b9dc9587ff8423cd3d5e6aa9107e7dba
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-08 11:48:23 +02:00
Daniel Teske
6773d47a63 AndroidDeviceInfo: Rename cpuABI to cpuAbi
Coding style.

Change-Id: I433b4d47f54c5a3a9aed68d99b2ab64a7e82d698
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 13:05:29 +02:00
Daniel Teske
d340d26eb3 Android: ant auto detection
Change-Id: I3afaab99c8e71a6dabe6d61ed55247a1cecc2d45
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 15:01:47 +02:00
Guillermo A. Amaral
6a6f3d2a53 Add support for 64-bit NDKs to Android Plugin.
Currently the Android plugin only checks for the linux-x86 prebuilds in the
64-bit Android NDK (and mingw-and-ndk), this means Qt Creator goes bonkers
because it can't find the toolchain and debugger for the kits it
auto-detects/creates.

A work around is to symlink linux-x86_64 to linux-x86 in every toolchain.

Change-Id: I04522b65ef48b6090a9f6925e8e3420ad1d333ee
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-10 20:12:44 +02:00
BogDan Vatra
616c55a2a4 Fix crash.
Check if there is any qtVersion->qtAbis() before getting the first element.

Change-Id: Ia55985b513cc2473dd0cfbef45877185d65df6ef
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-22 15:04:28 +01:00
Daniel Teske
15504d4db2 AndroidSettingsWidget: Start browsing for NDK/SDK at the current value
Change-Id: Ic1c5d6b015306108955a536845dd204dc8474a0d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-28 11:37:18 +01:00
Friedemann Kleint
a223b3472a tr()-Fixes in QNX, Android.
Change-Id: I6c0675ae96bf1563c9c4dffa8f73bb18e65b93b3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-22 11:17:17 +01:00
Daniel Teske
4ae4f05f91 Android: Fix Abi of qt versions
Change-Id: I441e6e29305eb082a8d713ab9d26b7fce419a509
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-21 19:58:35 +01:00
Daniel Teske
979815e675 Android: Automatic Kit creation
If both qt versions and ndk path exist automatically create Kits

Change-Id: If7739e866eeda3df2982850ff8f8cf22ca8f22c0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-21 17:34:04 +01:00
Daniel Teske
4a890f6d47 Simplify Android settings, move debugger/gdbserver to Kit
Creator now realiable creates one toolchain for each toolchain found in
the ndk. This no longer depends on any qt versions being present.

Also the gdb command and gdb server command are moved to the Kit and are
no longer found in the Android Options page. Both settings can be
autodetected from the Kit options page. Note that this might break
existing android kits.

Change-Id: I1dce084f2bb372e615e19b1c9e3a1e205b5d9647
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-07 19:21:20 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Daniel Teske
339b7ba203 Android: Fix title of dialog
Change-Id: I0f1b46ffb621384663a2fa3a76f70ec04ddfa717
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-30 11:40:02 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00