Commit Graph

1898 Commits

Author SHA1 Message Date
hjk
d2ec7d80d9 TextEditor: Merge the two sets of *EditorWidget constructors
Change-Id: I45d87d0be722ac36d64af222f03f8cb76242c9df
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-19 09:19:33 +02:00
Tobias Hunger
4a52d8216c Kit: Introduce variables for Kit display names
This change also adds a AbstractMacroExpander for the QtKitInformation.

It supports the following variables in the Kit display name:

 %{Qt:version} - Qt version number
 %{Qt:type}    - Qt type
 %{Qt:name}    - Qt version name
 %{Qt:mkspec}  - mkspec used by the Qt version

Task-number: QTCREATORBUG-11118
Change-Id: I7263781336ab561c34880b187ebd55e81e6ca215
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-18 17:17:50 +02:00
BogDan Vatra
05dffd3675 Android: Use the new gdbserver name for Qt 5.4+
Starting with Qt 5.4 we are packaging the gdbserver tool as libgdbserver.so,
otherwise gradle will refuse to add it to the package. Gdbserver is renamed
also for ant.

Change-Id: I4ef6408226ab05ea7b4e3d6f41dd368f5a602c7d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-08-18 09:02:16 +02:00
Eike Ziller
d9d0aba1c4 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
2014-08-15 16:14:34 +02:00
Daniel Teske
21b6d857fb Android: Fix link to fixed gdbs
Since the problem is close platform link to the parent directory.

Change-Id: I6e5128e9d00ed576ce048d1d48db61e6f758a979
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-12 14:14:12 +02:00
Eike Ziller
692845ae06 Android: Do not create temporary files in CWD
Change-Id: I52c575b43406c0a1a758c540e8d0947f51eca11b
Task-number: QTCREATORBUG-12813
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-12 11:33:27 +02:00
BogDan Vatra
85fff52937 Use androiddeployqt to install the package when using Qt >= 5.4
On Qt < 5.4 androiddeployqt can't be used to only install the package
(and qt libs if the debug deployment was chose).

Change-Id: Ia7939e7988163ec04bdc7a927fd3a89e4d824782
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-08 19:33:15 +02:00
BogDan Vatra
d7760f19a2 Android: Use the new gdbserver name for Qt 5.4+
Starting with Qt 5.4 we are packaging the gdbserver tool as gdbserver.so,
otherwise gradle will refuse to add it to the package. Gdbserver is renamed
also for ant.

Change-Id: I6da3ad54de591c124fe56d5464e74099dfd901a1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-08 17:37:28 +02:00
BogDan Vatra
dedb9172e0 Android: On Qt 5.4 AndroidManifest.xml is moved to templates folder
If we don't find it in the java folder we return the templates folder.

Change-Id: I8a9c478ed3f9e32e9ed8c656545ab90c18204e52
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-05 14:51:34 +02:00
Oswald Buddenhagen
f3a61e8bf7 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
2014-08-05 14:24:23 +02:00
hjk
d7c2b0b681 TextEditor: Consolidate document access functions.
There was document(), textDocument() and baseTextDocument().
Two should be enough...

Change-Id: Id9e41c8d857c5cb3269a9fce5ab594d34448c982
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 10:43:56 +02:00
BogDan Vatra
49707ff3f0 Android: Check if DebugDeployment is usable.
It might happen when the user changes the kit from Qt 5.4 to Qt 5.3.

Change-Id: Ib9597ac0189bdc1ac4e82ac8b5de5e090f09283e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-01 12:19:30 +02:00
Daniel Teske
bb42157f04 Android: Prevent crash if running on a terget without deployconfiguration
Should be impossible to do, but the stacktrace in the linked task shows
that it is possible somehow.

Task-number: QTCREATORBUG-12776
Change-Id: I1f2054bbaa132c29dfc4579fb7020f364bddd939
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-31 17:56:10 +02:00
hjk
98fd59fd09 TextEditor: Start moving data from *EditorWidget to *Editor
Goal is to consolidate "controller" related data in the *Editor hierarchy.
This patch introduces temporary "cross-Private" accessors dd() to
keep the patches small.

First item moved is the AutoCompleter, a glimps at long term benefits
is the simplification in the JavaEditorWidget which is now essentially
a BaseTextEditorWidget, only containing the still-wrong createEditor().
But that can only be move if the *Editors are self-contained, i.e.
keep data themselves, not indirectly through the *EditorWidgets.

Change-Id: Ia0ab90f0322bb17ac20458e6581069eed30acbaf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-31 16:45:31 +02:00
hjk
9fd2fe5a9a TextEditor: Make completion assist provider a data member
In case of the CppEditor a direct member is not possible due
to setup restrictions inside the CppEditor machinery. I'd expect
that to be fixable when the editor base system is in good shape.

Change-Id: I184e219ca2dff6f67c9b58c182212eb12972cc84
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-31 12:40:52 +02:00
hjk
f6b48950ed TextEditor: Re-work comment definition handling
No need for most of the machinery.

Change-Id: I9078174582d83da94c6c7f20282fd3a5f1742911
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-31 10:54:49 +02:00
hjk
6a52868cdd TextEditor: Update tab settings for all tab changes
Not just for selected documents. This also removes the need for
the separate setupAsPlainTextDocument function.

Change-Id: I51a04eebbad37a7598068ce6e157a53c1519464f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-30 16:21:43 +02:00
hjk
1924fdb90f TextEditor: Merge PlainTextEditor into Base
Same patter. Plain is fully merged now, so remove the files, too.

Change-Id: Id8c0ba5689ad9980a0db3580cb9833344fd911f3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-30 15:17:53 +02:00
hjk
068462e52d TextEditor: Replace PlainTextDocument by Base + a setup function
Change-Id: I1088062d0b74fd0dd69e92c55cc8bb80da61ae2d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-30 15:17:50 +02:00
hjk
faa0e5b96c TextEditor: Replace PlainTextEditorWidget by Base + a setup function
Change-Id: I91a3bfb66a72e9234ca59f97d5260bbfc3ccb0d3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-30 14:41:09 +02:00
Daniel Teske
e8f2bc1f60 Android: Fix wrong return values
Change-Id: Ia5917387c429278cac34a8d1f7a67631d491bff2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-30 11:26:16 +02:00
Friedemann Kleint
ca23a29178 Android: Fix compilation with Qt 4.
Change-Id: I2a25cbb19246526702c91b41e3e62f05f7833e87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-30 09:42:46 +02:00
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
b1f183d06a Android: Fix modified flag for changes to the application name
Task-number: QTCREATORBUG-12065
Change-Id: I2e86274b5b1155a952438e7ea9223f6260e7ea53
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-24 16:26:34 +02:00
Alessandro Portale
35d6394523 "foreach (QString" -> "foreach (const QString &"
Change-Id: Idb866407347722766edbc85ce20799b088ce36dd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-24 12:15:49 +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
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
Robert Loehning
9738422f6d Compile fix
Change-Id: I13306304f43933a8f0a642f10b6b05b796635f63
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-23 16:11:32 +02:00
Daniel Teske
66757653ff ProjectExplorer: Remove ITargetPanelFactory
The indirection via a factory is no longer useful, since the
targetsettingspanel is hardcoded for a build and run panel.

Change-Id: I75543f777a4a7df4cadf12667652424056829689
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-22 16:51:33 +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
30bad4b3f0 Use debug deployment method by default.
Alongside with Ministro is by far the fastest deployment method.

Change-Id: I02de831d312d60c50762e8130ccffefcf1f36843
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-22 13:30:12 +02:00
BogDan Vatra
d50e15f611 Disable signing when using debug deployment method.
The debug deployment method can't be used to create APKs that can be
published on Android markets.

Change-Id: I0539e1e7bcbf5935d74f9ee93cadc8b296a94664
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-22 13:30:04 +02:00
hjk
9f4322a398 Android: Compile fix for namespaced Qt
Change-Id: Iaf09e3528a6aceabe631aa7b53441ea940cc645b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-22 11:58:10 +02:00
BogDan Vatra
03ee5dc41f Fix message
Change-Id: Iec98cc61854d690f0fa0f4b19978dc16ede2db48
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-22 11:26:45 +02:00
Tobias Hunger
6175c16a6d ToolChain: Do not run compiler when setting up a toolchain
Do not rerun the compiler when setting up a new tool chain. All
the necessary data is already there, so there is no need to re-get
it.

This reduces the number of gcc runs at startup from 10 to 6 in
my settup (g++ and clang available on Linux).

Change-Id: Id02e79f52ab7a69d5edf84b711ab148d7bc43f21
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-21 16:40:44 +02:00
Daniel Teske
04a9422b48 AndroidConfig::apiLevelNamesFor: Rewrite using Utils::transform
Change-Id: I93f5f3248dc83ab5d53def6e86431354b431c26f
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 13:25:42 +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
Daniel Teske
4657ac7452 AndroidRunConfigurations: Split up into general and qmake specific parts
The plan is to eventually move the qmake specific class into the
qmake plugin.

Change-Id: I5653c45ed88b1be296f4963ab4117bbfa791fb85
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 12:41:21 +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
8481c91fbf Android: Set ANDROID_NDK_PLATFORM based on the mimum sdk version
And not based on the build sdk version.

Change-Id: I31a37652d40408e7bfc3f49366d97f560ee99c71
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 12:41:10 +02:00
BogDan Vatra
384d5d7577 AndroidConfig::bestNdkPlatformMatch: Ensure that api level 9 is minimum
Change-Id: I527c7ce13b01f441183940a5e0ea2baec64c04e3
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 12:41:01 +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
c4451570e7 AndroidDeployQtStep::processFinished: Check for exitStatus and exitCode
If the build failed there's no point in opening a shell.

Change-Id: Icf27fa82c105f934a5d81ab0f317e0396cb12697
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 12:40:49 +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
BogDan Vatra
5211591e5a Android: JavaEditor: Fix comment
Change-Id: I8e87255ae16ad80314884c1df9753133ccf745c8
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 11:31:52 +02:00
Eike Ziller
c571ecbd51 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/git/changeselectiondialog.cpp
	src/plugins/git/changeselectiondialog.h
	src/plugins/git/gerrit/gerritplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/git/gitclient.h
	src/plugins/git/gitsettings.cpp
	src/plugins/git/gitsettings.h
	src/plugins/git/mergetool.cpp

Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791
2014-07-18 14:04:51 +02:00
Leena Miettinen
282a45a6cf Android: apply UI text guidelines to messages
Do not use "please".
Replace "a image" with "an image".

Change-Id: I32614291b3be4c8a9860ddf8036ef5898bf52ce6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-18 09:06:59 +02:00
Eike Ziller
e7ea94b688 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
2014-07-17 12:42:04 +02:00