feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

1898 Commits

Author SHA1 Message Date
Daniel Teske
ba315fa750 IRunControlFactory::displayName: Remove unused function 
It's never used.

Change-Id: I11cc85b1d9a5944017b8a03738877f91cfe5d11f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-25 18:33:51 +02:00
Aurindam Jana
e8c23e1d71 Android: Setup QML debugging 
Change-Id: Ida96411f9710bd9a968d4b934fb50f69bf3666fc
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-04-23 12:06:29 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
 2013-04-23 11:13:25 +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
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
 2013-04-18 09:22:19 +02:00
Aurindam Jana
2a98a9f11e AndroidDebug: Removed unused gdbServerPort member variable 
Change-Id: I4804e46cec3285280bcea28e7900c8b07d487fb6
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-04-17 16:19:13 +02:00
Aurindam Jana
e65b976b43 AndroidDebug: Removed unused qmlport member variable 
Change-Id: I339e2e4f4f0ce52b1220745357170a457a14be35
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-04-17 16:19:04 +02:00
Daniel Teske
7298984039 Android: Fix reload prompt on changing settings in the package step 
Change-Id: I102a4843652029dff757e12594efc4d5e5e50a99
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-04-17 13:25:59 +02:00
Daniel Teske
09f20adc7b Android: Only show android sdk versions that are supported by qt 
That is at least android-9 for qt 5.

Task-number: QTCREATORBUG-9067
Change-Id: I977f8a35e5d2db2c645fe1a1bc52ef5d7b9f8b35
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-04-16 14:04:59 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
 2013-04-11 18:27:52 +02:00
Oswald Buddenhagen
f9f8cd354b auto-generate <dependencyList> in .pluginspec files 
Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-04-11 12:52:03 +02:00
Daniel Teske
f462e6f3ef AndroidDevice: Update after the device manager has actually loaded 
Change-Id: Ibab03ef09dea6312a0d4c812c819d847b1399298
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-04-11 11:39:22 +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
Christian Kandeler
403f41efb7 Fix potential assertion when removing Android device. 
The device manager does not like it when you remove non-existing
devices.

Change-Id: Ied1b28963a0513761c9cf247c414e0ea29dc8086
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-10 12:06:15 +02:00
Daniel Teske
befd041dbd Android: Add/Remove Android Device on configuring android sdk path 
Task-number: QTCREATORBUG-9017

Change-Id: I5adf4be57b76cf8d0f8e0afebe9540a9f92a29a2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-04-09 19:08:23 +02:00
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
 2013-04-08 13:26:37 +02:00
hjk
066efcd6a6 Debugging on Android 
This implements the host side of
https://codereview.qt-project.org/#change,50290

Change-Id: I13c7df29534a2a85202c2b295b139896443b0120
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-04-08 12:05:44 +02:00
Tobias Hunger
533644290f Move DebuggerRunConfigurationAspect into Debugger 
Change-Id: I03cab5d963a6d7c77171efe360a552d8109f6a8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 14:56:25 +02:00
Tobias Hunger
e474b6ed8f Demote debuggerrunconfigurationaspect 
NOTE: Next patch will be "Move DRCA to Debugger plugin" and is
needed to make this functional.

Change-Id: Ie405a0e4fbdc0fb35ff16d34c725e7aee5153a4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 14:56:12 +02:00
Tobias Hunger
036d977b93 RunConfigurationFactory: Centralize much of the restore code 
Change-Id: I30c92dd5082eed050c2796a014919788710baafa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-05 08:55:11 +02:00
Tobias Hunger
1650c22b7b RunConfigurationAspect: Add RunConfiguration parameter to factory method 
Change-Id: I7fbb82dc3ff83593473a57c69d0eb89bc33f50f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-05 08:55:01 +02:00
Daniel Teske
64f373e6cc Android: Create directory for gdbserver 
Task-number: QTCREATORBUG-9035

Change-Id: I2b22bebe7340105155b6efd3cb070f1a839a6d3c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-04 12:17:56 +02:00
Oswald Buddenhagen
06acd82ada derive TARGET from QTC_{LIB,PLUGIN}_NAME 
the information is redundant now

Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-03 14:37:56 +02:00
Oswald Buddenhagen
66a3553107 make library and plugin dependencies declarative 
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.

Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-04-03 14:37:45 +02:00
Oswald Buddenhagen
9631fb88cf centralize assignment of TEMPLATE = lib 
Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-02 17:13:17 +02:00
Tobias Hunger
c71d734d08 Android: Fix Javaparser 
Make sure to send output down the right channel in case some
parser is appended.

Change-Id: Ibb6810acf7498c07d5169b6133d8d04ce21ce993
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-02 16:02:31 +02:00
Oswald Buddenhagen
7ce3362288 automatically include libs' and plugins' _dependencies.pri files 
Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-02 12:19:31 +02:00
Daniel Teske
e9dceef1bb Android: Remove empty button on android device page 
Task-number: QTCREATORBUG-9017
Change-Id: Iba8900dd3d5a5ab380c361abd435b08857eb1fd2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-02 09:33:43 +02:00
Orgad Shaneh
03e7037aaa Android: Fix compiler warning 
Comparison of bool and int

Change-Id: Iec471ce393442c4d75dffce4b3ddc9d275c17e67
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-27 15:33:28 +01:00
Friedemann Kleint
dbcf8f4e42 QtSupport: Forward-declare some classes. 
Change-Id: I7f0eb6c4ea8620c8405f6d13c554c0ec913edd63
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-27 12:51:30 +01:00
Eike Ziller
96a5245d8e Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2013-03-26 13:10:09 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
Friedemann Kleint
92207c96b7 Clean headers in ProjectExplorer. 
Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-26 12:37:29 +01:00
Daniel Teske
22b2c30aa5 Android: Fix setting of icon 
Task-number: QTCREATORBUG-9014
Change-Id: Ib155b09f5c57101cbacce1c2e9981a7d5b6be731
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-25 10:58:25 +01: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
ceba2fc0e4 AndroidDeployStep: Adjust to MessageManager api change 
Also since the deploystep runs in the background do not force a mode
switch.

Change-Id: I5deb4eb09f331e31d153f828ebadfa3ae4387ac2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-22 13:50:39 +01:00
hjk
77094e6e5d Android: Use new Core::Id::suffixAfter function 
Change-Id: Ia2b11aa713e2f28433583da1f4c8bb10754b55fc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-22 11:34:07 +01:00
Daniel Teske
b6257ef735 AndroidQtVersion: Make environment hack safer 
We need to set ANDROID_NDK_PLATFORM in the environment, but doing so is
not really possible on a per project basis. Make the hack in
AndroidQtVersion that sets ANDROID_NDK_PLATFORM safer by checking if the
current project's active target is indeed using a android kit.

Change-Id: Ifcdb07a19708ac6bac5f5a02caa1ff197c0e4d80
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-03-21 08:28:37 +01:00
hjk
11cd0e5b1b Android: Simplify use of Core::Id 
Change-Id: Ie07b8b97be37424e642265e706662af9f2102632
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-19 17:07:22 +01:00
Daniel Teske
b76992c3f5 AndroidQtVersionFactory: Do not detect unsupported/android-g++ 
See qtbase commit 97fcf3bc987a18f32233fea550eb4a5a22e2b822

Change-Id: I4a94ab12a6bac0505fe4e6da4a72cb8b7e0b7032
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-03-19 15:12:50 +01:00
Eskil Abrahamsen Blomfeldt
a20dd013a7 Android: Fix use_local_libs when running from launcher 
The old way of passing the use_local_libs settings to the
app (which is still supported for compatibility with Necessitas)
was to pass it as command line arguments when the app is
launched from Qt Creator. This will make the app depend on
Ministro if it's later launched from the Android launcher.
To avoid this, we pass the info as part of AndroidManifest.xml
instead.

Task-number: QTCREATORBUG-8643
Change-Id: Ib044ce8bf7e285cf46075a8713bd7fc6736052d5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-18 10:33:39 +01:00
Friedemann Kleint
dc95392aa4 Fix wasteful loops in AndroidManager::availableQtLibs. 
Detected by Krazy (values or keys iteration).

Change-Id: I2ebfd4690261139ea0739bc9c00692c06064539c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-12 16:18:19 +01:00
Friedemann Kleint
6da08b530f Fix Krazy warnings about includes/header guards in Android. 
Change-Id: I921be0a520341457bf96bbcc3a1caa6e09a9cb6f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-12 13:56:19 +01:00
Eike Ziller
3bc622400d Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
 2013-03-12 10:56:52 +01:00
Daniel Teske
d7d15e57cf Android: Fix Qt detection, use QMAKE_PLATFORM to detect android 
Change-Id: I68591b92b25f41cd56f86403920ad38cf60d44d7
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-03-11 13:34:52 +01:00
Daniel Teske
7789ba45f0 Android: Also include indirect dependencies in libs.xml 
Change-Id: I12d5aff64fc6b677ac88c28eed90ae51443c7584
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-03-11 12:58:51 +01:00
Friedemann Kleint
c3a4c7e4a2 Fix crazy warning about non-const ref iterator in Android. 
Change-Id: I7195ef05160f0af26143f81fbe744b3186f16df8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-08 12:53:26 +01:00
Eike Ziller
f60873a24f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
 2013-03-08 11:39:33 +01:00
Daniel Teske
ad90382443 Android: Remove "Edit rules.xml" button 
It serves no pratical purpose.

Change-Id: I65494ca6be14c96baa6bad521f11e130edfc614a
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-03-07 13:27:54 +01:00
Eike Ziller
7545ce072f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
 2013-03-04 15:07:19 +01:00