Commit Graph

142 Commits

Author SHA1 Message Date
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
BogDan Vatra
3bcae52584 Android: Say hello to gradle!
Switching from Ant to Gradle brings lots of advantages:
 - it is way faster when rebuilding (25-50% faster than ant).
 - it enables first class Android Studio integration.
 - adding Android Extras libs (e.g. Google Play services, OBB, etc.) to
   your project is now painless.

[ChangeLog][Android] Added Gradle support to build the APK.

Change-Id: Iee492954f8ffb2c22e6ab14a8a25faf644de9a51
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-25 13:15:25 +02:00
hjk
6431ab2c79 Use Qt 5's QStringList::join(QChar)
Less typing and less cycles than join(QString) where appropriate

Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-25 08:21:14 +02:00
Nikolai Kosjar
0ffe7f482d Android: Remove unused variable
/home/nik/dev/creator/creator-master/src/plugins/qmakeprojectmanager/androidpackageinstallationstep.cpp:49:12:
warning: unused variable 'ANDROIDDIRECTORY' [-Wunused-const-variable]
const char ANDROIDDIRECTORY[] =
"Android.AndroidPackageInstallationStep.AndroidDirectory";
           ^

Change-Id: Idd4a17ef113fbeaf40a97d4966ea5438a6cd2f4e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-24 11:18:25 +02:00
hjk
341ec7f977 AndroidManager: Remove more unused code missed earlier
Change-Id: Idbe281a55fd6a30b258686f7d384a9a8d5088ed1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-22 15:49:10 +02:00
hjk
5763dfca82 AndroidManager: Remove unused code missed in necessitas removal
Change-Id: I52ddd7cc89950c38e95135fdc2ee7cf655782165
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-22 14:49:12 +02:00
hjk
1768d20bf5 AndroidManager: Move private static functions to implementation
Change-Id: I245af5cc77360aa70838153e0fd8eb15ffe659d8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-22 14:49:07 +02:00
BogDan Vatra
64e5a543a8 Move qmake specific part to qmake plugin, generalize android support
- Split up androiddeployqt into two steps: One building the apk,
  and one deploying it to the device.
- The build apk step base class AndroidBuildApkStep is ihneritaged by
  the qmake specific class QmakeAndroidBuildApkStep.
- The deployment step is still called androiddeployqt
- Move all qmake specific code to the qmakeprojectmanager plguin
- Flip the depencency between the android and qmake plugin, now
  the qmake plugin depends on the android plugin, implementing
  a interface the android plugin provides.

- Note: This removes the debug deployment for now.

Change-Id: I1c386640159ed14b637668abde8eb3b9009ab803
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 12:41:28 +02:00
BogDan Vatra
6a4c47b176 AndroidDebugSupport: Split up into general and qmake specific part
Introudce AndroidQtSupport. The derived class will eventually move to
the qmakeprojectmanager plugin.

Change-Id: I3fdc98259644fe718eb15aa9bd11d92dc0cdb1af
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 12:41:14 +02:00
BogDan Vatra
381b04fa04 Android: Remove Necessitas support
Change-Id: I082acfad3b20d5e096fbb2ca3db775bb527eaf7a
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 12:40:55 +02:00
BogDan Vatra
c55d9a8e17 AndroidManager::checkForQt51Files: Make parameter a Utils::FileName
Change-Id: I2944f6c36fee7b362ef7dbbf1053954c41607fe8
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 11:31:55 +02:00
Daniel Teske
67a7696e60 androidNameForApiLevel: Api-Level 20 is Android L
That's unlikely to be the final name, but introduce it for now.

Change-Id: Iaf1fd65e797a2354433b9bb5af6a6d76ecb8409c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-07-17 11:29:21 +02:00
Daniel Teske
41ba6f38e4 Android: Report api level of unknown android versions
Change-Id: I5893b5e9ec57da68dc09d0c10a8a43dc074cdd73
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-07-17 11:29:11 +02:00
Nikita Baryshnikov
12103e0f67 Reinvent deprecated qSort as Utils::sort
Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-19 14:00:32 +02:00
Tobias Hunger
dc61b989ac Project: Use Utils::FileName as return type for projectDirectory(...)
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-06 11:48:10 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines.
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-22 10:06:40 +02:00
Daniel Teske
a087b3cd7f Android: Rework Create AVD dialog
Filter the list of api levels to only show those that can be created.

Change-Id: I7aaaa58324ca44176e39982cda29d746011fa346
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-04-01 16:24:45 +02:00
hjk
3b84a6dc88 Use ICore::dialogParent for message boxes without parent so far
Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-12 12:06:10 +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
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
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
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
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
f61e643c95 Merge remote-tracking branch 'origin/3.0' 2013-11-20 11:25:36 +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
6fda5f2987 Android: Mark "Unknown Android version" string as translateable
Change-Id: I187775878c0fa4341b5eef0bee035fd407fe6aa8
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2013-11-18 12:36:58 +01:00
Orgad Shaneh
4442a92729 Braces cleanup
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-14 08:13:52 +01:00
Paul Olav Tvete
27a4a006da Add "Android 4.4" as name for API level 19
Change-Id: I9fd032fe7bd45955704ad09d302fb175b7cb7ce3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-12 12:22:32 +01:00
Daniel Teske
ae55018548 Android: Fix in source builds with Qt 5.2
Now the build directory is by default android-build, so by default the
source and build directory don't clash anymore.

Task-number: QTCREATORBUG-10661
Change-Id: I054bd3790f9bc9720536aac301bee192cb9f0429
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-07 16:47:20 +01:00
hjk
7ce22266de QmakeProjectManager: various renaming cleanup
Change-Id: I0433317d03aefb8e175f2208ca7ae29fa3e9fa49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 18:12:12 +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
ce9c2efd1f Qt4ProjectManager: Rename {Qt4,Qmake}{Project,Pr{i,o}FileNode}
Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-29 14:54:53 +01:00
Daniel Teske
1df66a18d1 Android: Rework sdkTargets() to cache the output of adb
Also rename/change highestAvailablePlatform to highestAvailableSdk.
This fixes a bug reported on irc, where the lists for sdk and ndk
were different and the highestAvailablePlatform was not available
as in the sdk.

Change-Id: I17fec9e8ce1913e933ddcf8eaa21d6bb6e14c5be
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-18 13:09:27 +02:00
Daniel Teske
5e10114e76 Android: Remove bestMatch calls in fallback code in buildTargetSDK
besdtMatch finds a ndk version that is at most the targetApi passed into it.
Since we are passing in the fallback and lowest possible api level that qt
supports, the function would return at most the lowest supported version.
That's not very useful and cannot have worked, so simpy return the fallback
version directly.

Change-Id: I5e4757639099af4d207f928b0335d28efd75a02b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-18 13:09:18 +02: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
hjk
ebcd992577 Rename namespace Qt4ProjectManager to QmakeProjectManager
First step towards plugin renaming.

Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-16 12:09:59 +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
0a43f097de Android: Handle cases where the project is unparsed.
Change-Id: If1757fff8ff458610dae8cbfcf561154c7d56753
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 16:35:48 +02:00
Daniel Teske
1262310798 Android: androiddeployqt support
Change-Id: I37d706b4e11c6e1353a8ee73378b7d080080678c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-26 17:13:27 +02:00
Daniel Teske
a3a20c5697 Android: Fix unnecessary warnings from qt about .arg
Change-Id: I780dcf3ebd174275389620319e2d4b4784c84346
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-11 10:43:47 +02:00
Nikolai Kosjar
69fc3cf03f Kill ";;" at end of statement
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-04 09:19:10 +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
31fe6f069c Android: Use minimum sdk instead of build target sdk to filter devices
Task-number: QTCREATORBUG-9662
Change-Id: I3a5b3493bc8ef48bd23d014e86eef45185f3c17e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 16:05:44 +02:00
Daniel Teske
307aa7b3aa Rename AndroidManager::targetSDK to buildTargetSDK
There are 3 different sdk settings:
- The minimum sdk setting from the AndroidManifest.xml
- The target sdk setting from the AndroidManifest.xml
- The target sdk setting from the project.properties file

The last one is now called buildTargetSDK, since it only affects the
build.

Change-Id: I373d925a45088ff0cf8a8e0b22cf9744e571eeb1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 16:05:35 +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
cc7fe5eac6 Project: Simplfy file adding/removing interface
The filetype is only relevant for Qt4 projects. But even for Qt4 projects
the file type is insufficient to decide where the file should be added.
So remove the file type from the interface and let the projectmanagers
themselves figure out what they want to do.

Also fix
Task-number: QTCREATORBUG-9688

Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:05:04 +02:00
Eike Ziller
42c9c96361 Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/qmlprofiler/qmlprofilerengine.cpp

Change-Id: Ic9dc22d2d4a7306cfc4ef0ec158993e3768a9853
2013-06-14 16:19:14 +02:00
Daniel Teske
cb6eaa3c24 Android: Set JAVA_HOME in environment and use that environment
Change-Id: Ia0f3abad74b7ac423fab621ca22e0f698747c477
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
2013-06-14 13:13:12 +02:00
Eike Ziller
4acece6d9e Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
	src/plugins/qmlprofiler/qmlprofilerengine.cpp

Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4
2013-06-05 11:14:48 +02:00