Commit Graph

1898 Commits

Author SHA1 Message Date
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
a3454cadb6 Android: Support Android-L with a hack
android list avd outputs "Target: Android L (Preview) (API level L)",
which we treat as API Level 20 now.

Change-Id: Idc74fc833ffd69959af9d25cdaaa115f35c06831
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-07-17 11:29:17 +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
Daniel Teske
1b0279955f AndroidManifestEditor: Fix versionCode being limited
The android documentation does not require a minimum value of 1,
but suggest that "Typically, you would release the first version
of your application with versionCode set to 1". Thus keep the
minimum of 1. A maximum value is not specified.

Task-number: QTCREATORBUG-12668
Change-Id: I6bfb0a534661af82b6fcfe5667d9224893707e41
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-07-17 11:21:55 +02:00
Orgad Shaneh
71b56d2b9c Some QString -> FileName transformation
Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-16 12:44:01 +02:00
Eike Ziller
bef7181ed0 Set parent for options dialog where appropriate.
Otherwise the options dialog might appear behind the current "dialog"
(for example the "new" wizards).
Also, take ICore::dialogParent as default.

Change-Id: I4578e269db5763842a942549a45ec8cdd6b28b5d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-14 16:24:26 +02:00
Kai Koehne
a9619af26c Fix compiler warnings about argument being non-const in virtual base method
Another follow up fix for 93304df038 .

Change-Id: I39c98ed2e769a048c00931bd3b850d4d50310d99
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-11 15:34:34 +02:00
Christian Kandeler
93304df038 Always pass Core::Id by value.
Currently we pass in some places by value, elsewhere by const ref and
for some weird reason also by const value in a lot of places. The latter
is particularly annoying, as it is also used in interfaces and therefore
forces all implementors to do the same, since leaving the "const" off is
causing compiler warnings with MSVC.

Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-01 11:52:08 +02:00
Daniel Teske
9d5ff46534 Android: Increase timeout for adb to 10s
On some machines adb takes a longer than 5s to finish. The reasons for
that are unknown.

Change-Id: I949dc40b8f407aa98be0456df47a9ebe88e230a5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-06-26 11:11:07 +02:00
hjk
48b12fe921 Valgrind: Compile fix for Windows
Change-Id: Id60005f4760746299827fb502f1c0afec71542df
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
2014-06-19 14:23:22 +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
Alessandro Portale
fe08cb8902 Centralize error/warning/info icons
There are multiple copies of these pngs in different plugins.
Let's have one version in core, also as @2x variant.

Change-Id: Iedff1a6190a72c1947dd202ae1ee46f59f9fb13c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-17 22:45:09 +02:00
Daniel Teske
c78258cd57 Allow the user to restrict rc creation to certain .pro
Task-number: QTCREATORBUG-10953
Change-Id: Iff1a31c007ac777bfa390d48237480ef56ffc0e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-16 13:04:23 +02:00
Daniel Teske
204de740ec QmakeProject: Replace applicationProFilePaths by idsForNodes
Change-Id: Ie10e8cb93f26eb2087272646668fafd480b0208d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-16 10:30:57 +02:00
Eike Ziller
1fda462500 Avoid explicit checks for windows host when working with file paths
We have fileNameCaseSensitivity and withExecutableSuffix et al.

Change-Id: I79bd2cd57e258c3f15673a661a49bab597d7afa4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 14:33:34 +02:00
Daniel Teske
241d3a1ef6 QmakeProject: Rework allProFiles()
Change-Id: I49309565368fb8e00dd5a67c0e3ac77392924c75
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-12 12:56:48 +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
Tobias Hunger
e7689ce967 IWizardFactory: Rename StandardFileWizard to StandardFileWizardFactory
Change-Id: I6594b79c025285c28542a39742fd80afecf80b73
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-05 10:56:56 +02:00
Tobias Hunger
9356432305 IWizardFactory: Rename BaseFileWizard to BaseFileWizardFactory
Change-Id: I92977422bf8088b53e920370737907d60cf8708b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-05 10:56:27 +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
hjk
26b54747e2 RunControl: Make icon(path) a value member
Change-Id: I7f7099d03a25a14d8df02273cca928e9f1fbfe1d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-30 13:07:54 +02:00
Tobias Hunger
a8e8910130 IWizard->IWizardFactory
Start at splitting up the wizard functionality a bit. Currently
it is a factory but also contains a lot of logic that is invoked by
the real wizard dialogs.

This change renames/moves a couple of things only.

Change-Id: I1fa114ee3ee262f7c0690841f361bbf09e674725
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:42:03 +02:00
hjk
3462c5ef42 IEditor: Make duplicatesSupported a value member
Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-21 14:29:00 +02:00
Orgad Shaneh
27cbc89c5b Android: Remove unneeded null validation
Change-Id: Iede5baafd13f8b1a997336d843004e6423985616
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-05-21 13:28:47 +02:00
Alessandro Portale
d6b12213a7 ProjectExplorer: Use constants for compile_warning.png and _error
Instead of repeating strings like
   ":/projectexplorer/images/compile_warning.png" all over the code,
we should use constants for it.

Change-Id: I91b36838d6da0a2332381e433788e796948d26db
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-19 16:51:59 +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
Tobias Hunger
01d9e4d70b Android: Fix warning about hidding overloaded virtual method
Change-Id: I5787af2620565f759ee2e739d1458e3f0cf63f2b
Reviewed-by: Wiebe Cazemier <wiebe@halfgaar.net>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-12 10:53:16 +02:00
Alessandro Portale
551f7e1caf QString(QLatin1String()) -> QString::fromLatin1()
Change-Id: I93bdd926ca1c7a37a298335711069d985f1f91dd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-09 09:03:19 +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
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
hjk
2e757deab4 ProjectNodes: Refactor runConfigurationsFor()
Rename to runConfigurations() and remove the node argument which is
available as 'this'. Adjust const-ness of node argument in
RunConfigurationFactory::runConfigurationsForNode

Change-Id: Icb63e96a305152f90135a2656536de2581faafaf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-29 12:35:29 +02:00
Daniel Teske
a601b1140d AndroidQtVersion: Remove unsupported features: webkit and console
Task-number: QTCREATORBUG-12107
Change-Id: Ib8022d63c9a2725a49961207321a06f8bf0672cf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-28 10:53:23 +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
25e6d581d3 Android: Support new android list target output
Change-Id: I287c0b7acb32d391080a57792740b3316a87c64d
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-04-14 15:12:45 +02:00
Daniel Teske
75dd839469 Android: android list target output doesn't always end with a marker
Handle the case where the output doesn't end in ====

Change-Id: Ia37f64259c3cae9a016d854dc1b056d9a4459a62
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-04-14 12:30:46 +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
a758d6e3b0 Android: Warn against a package name starting with _
Task-number: QTCREATORBUG-12009
Change-Id: Ia8bded2e4c84b3fedca2f0a64a487cd1760e07d5
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-04-14 12:02:04 +02:00
Eike Ziller
b687658663 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521
2014-04-08 11:18:40 +02:00
Friedemann Kleint
b455518c38 Fix warning about converting enumeration to bool in Android manifest editor.
Change-Id: Ib4b51080d878daf96709b77293604eada6555b69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-04 11:57:27 +02:00
Daniel Teske
579da1faf1 Android: Ensure that ANDROID_NDK_ROOT is set while parsing the mkspec
Task-number: QTCREATORBUG-11821
Change-Id: Icbf8d6dd84da6ddba7d9c9e540916a804fb962f1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-04-03 13:08:22 +02:00
BogDan Vatra
46d9b4ee36 Fix keytool parameters.
Task-number: QTCREATORBUG-11417

Change-Id: If9de1dd40b6f43f020d6d5fef59519b0946b3888
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-03 12:20:26 +02:00
Eike Ziller
cab8e4aa03 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
2014-04-02 13:24:34 +02:00
Christian Kandeler
c9a9814f89 Android: Fix qbs build.
Change-Id: Ifc08b5bd004f82f7023ad49cb7cc87734839f272
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-02 12:01:17 +02:00
Daniel Teske
2273502843 AndroidExtraLibsModel: Use QDir::cleanPaths() for entries
Change-Id: Ie429b3e04d933663e9f6a883048ab75851ca63cd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-01 16:25:32 +02:00
Daniel Teske
4facd1ea5c Android: Prepend $$PWD to paths to ANDROID_EXTRA_LIBS
Task-number: QTCREATORBUG-11868

Change-Id: I3d3e559d7d5d58efb5b28bc29b71fa812cee277c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-04-01 16:25:18 +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
Daniel Teske
765ad6c3d2 Android: Set ANDROID_EXTRA_LIBS scoped to the arch
The workflow for adding a library for multiple archs is not ideal, but
now a little better. The user has to go to the deploy setting for a
kit per architecture and add the right extra library.

Change-Id: I2bda6961f6f1164bdc58acd78fa3d2221977f0cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-04-01 16:23:10 +02:00