Commit Graph

1898 Commits

Author SHA1 Message Date
Friedemann Kleint
686c085062 tr()-Fixes for 2.6.
- Fix typo.
- Fix invalid usage of tr() in ServiceBrowser.
- Remove plural form in Debugger.
- Give ElfReader a proper tr()-context.

Change-Id: Id3172f0e093fd5fbe328061d32d2ba7fcfebaca7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-07-30 18:45:13 +02:00
Robert Loehning
4300c637c8 Fixed capitalization of "Qt"
Change-Id: I9580c9f2a067ec30da111eb6ada61f5064a4dc5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-30 16:44:29 +02:00
Friedemann Kleint
bf980649d2 tr()-Fixes for 2.6.
- ProjectExplorer::Profile should appear as 'Target' in the UI.
- Fix messagebox title capitalization
- Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class
  names, add where applicable to replace
  QCoreApplication::translate().
- Introduce message utility function for the commonly used
  'No tool chain set up for this profile' message to
  ToolChainProfileInformation.
- Introduce message utility functions related to adding files
  to version control to VcsManager to be shared by QmlJsEditor.
- Fix typos.
- Remove QObject::tr(), QCoreApplication::tr().
- Do not translate diagnostic console warnings of
  QmlProfiler.

Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-27 17:08:12 +02:00
hjk
5c94f8114f projectexplorer: move kill/list to IDevice
Change-Id: Ic4cbf62a61f7d0bf72e700a77c08788850cde85b
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-27 14:18:21 +02:00
Robert Loehning
ed7c80d4c6 Normalized connect()s
Change-Id: Ieb95bd04026d4a8ba824e6355031954332654e99
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 16:12:43 +02:00
hjk
b906360a34 madde/qnx/remotelinux: adjust after profile changes
More Profile use, less dependency on QtSupport,
Derive qtVersionId from profile instead of qt build configuration.
Replace qt4BuildConfiguration with buildConfiguration.
Use IDevice base class in AbstractRemoteLinuxApplicationRunner
and in other places.  Simplify remote linux runconfiguration

Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-26 12:50:06 +02:00
hjk
ba6bd10312 device handling: move LinuxDeviceConfiguration::MachineType to IDevice
Change-Id: I1619f8ca7751acfe3379b6486949b65c1f9b42fd
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-26 08:33:25 +02:00
hjk
26e7ed14b7 debugger: remove unused code
Change-Id: I105aa0433530abb4e9f53de19c0846281ccda0cf
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:39:00 +02:00
BogDan Vatra
e73025d0ab Fix Android toolchains detection (ndk-r8b).
Change-Id: If0824d859fbf50d76798711642b4996db66cd46f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-19 22:24:01 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Daniel Teske
09b5aa6eb2 Remove duplicated includes
Change-Id: I113e4c2afc6c881bc9c62f7ff08dbc69005037a5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:23:25 +02:00
Daniel Teske
c63dd913a9 Make AndroidManager completely static
All the methods are static now, so there's no need to instanciate the
class.

Change-Id: Ibb615f1f863ed1ad8e27dfb44d69998ea1061550
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-18 11:22:58 +02:00
Tyler Mandry
fcd01af143 Android: Add QML debugging support
Change-Id: I2fb2c75001569385e417ea44ae90d34e92a22449
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-17 23:47:31 +02:00
Friedemann Kleint
29a65750f6 Fix tr() error in Android plugin, use QT_NO_CAST_FROM_ASCII.
Change-Id: I7ccc55c914b4d5447ad238acfb2ff76cc28d6b23
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:40:21 +02:00
BogDan Vatra
096c4db896 Run zipalign tool after android packges is created and signed.
Change-Id: Idaeb93490723085b8f5f7cae356fbaee40636f89
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-10 11:40:24 +02:00
BogDan Vatra
7140a685d3 Fix Android package signing
Change-Id: I80520267e18b30a9deeceeddf1c05a7646e9bc94
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-10 11:39:59 +02:00
Oswald Buddenhagen
5e596e89d0 introduce qmakeProperty(), use instead of versionInfo() where applicable
the idea is to encapsulate accesses to specific variables.

Change-Id: Icafd2c85de6178db1a492a5dd36dde7f1925ea21
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:15:30 +02:00
Orgad Shaneh
618115c3cd Fix qbs build
Change-Id: If532d1498fecdf07fa5f5743b90528f0dd2eab9d
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-05 10:55:11 +02:00
BogDan Vatra
a16d355dce More Android fixes, add default android device.
Switch to new android assests scheme

Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 11:26:56 +02:00
hjk
ded2dd12b8 debugger: adjust to profile changes
This replaces the debugger command, sysroot and target abi fields
with a profile id.

Change-Id: I831c42ff8624fcfa520c2f28f6f06d73191b2680
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 15:30:15 +02:00
Tyler Mandry
17eedb2af9 Android: Remember 'Use local qt libs' deploy setting
Change-Id: Id673f2a28d720c803342948adc4e89678d1a6390
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-26 10:28:26 +02:00
Orgad Shaneh
7204863c13 Fix qbs build
Change-Id: Ib484836705c30cb90ee52e87867e2bfde6358d64
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-25 12:10:17 +02:00
Thiago Macieira
1d90cc2ecd Fix building the Android plugin in C++11 mode again.
I had fixed this in e638dc8232 but the
changes were reversed in 2431456216.

C++11 requires a space for concatenation of string literals.

Change-Id: Iba34319953c003469ec89d2c99973bd07a124390
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-25 11:35:22 +02:00
Tyler Mandry
ccd2168219 Android: Clean/speed up some code.
Change-Id: I122bc317a32f938c57f79e93f65170de26f13202
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-25 10:35:41 +02:00
BogDan Vatra
bb0573a8aa Fix Android plugin.
Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-23 11:53:33 +02:00
Tobias Hunger
bb793093ed Fix reading of existing .user files
Update factories for this to work as well as the settingsaccessor.

Change-Id: If7cb1db3fa0c50441aa5bd1c2d2659c6a0177743
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:11:05 +02:00
Tobias Hunger
420fd035ab Remove some useless lines
Change-Id: Ib64fa3f0ba1b020077440d14390872bedfae76e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:39 +02:00
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
hjk
7853297f77 runconfig: consolidate createConfigurationWidget implementations
Most derived classes used essentially identical 'return 0;'
implementations. Use a base class implementation doing that instead.

Change-Id: I99727ac2230a5d9f168b4b0eb5927f8efff44e64
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-19 12:46:23 +02:00
Yuchen Deng
0d20c5b796 Fix qbs code style
Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 11:22:40 +02:00
hjk
ceb575741c debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*
Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-13 17:11:58 +02:00
Thiago Macieira
e638dc8232 Fix compilation error with C++11: space needed for string concatenation
The error was:
filenamevalidatinglineedit.cpp:101:47: error: unable to find string literal operator ‘operator"" SLASHES’

Change-Id: If990dd75a7b2cb4186b81115087c66e0dd1d888b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
2012-06-07 08:07:49 +02:00
Friedemann Kleint
753acdcf82 tr()-Fixes in master.
- Add missing Q_OBJECTS
- Clean up Android, fix capitalization, remove redundant
  translations.

Change-Id: I24583b7e363ff8f90cad3b8257b676888e8a59db
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-28 00:23:29 +02:00
hjk
f77cd29e54 IOptionsPage: replace virtual fuctions by data members
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 10:48:04 +02:00
Tobias Hunger
5a79945ef6 DebuggingHelper: Move to QtSupport
* Move debugginghelper to QtSupport. ProjectExplorer should not start
  looking for Qt versions!
* Make autotools and generic project plugins depend on QtSupport

Change-Id: If28418a85e3696cba713e66148c893a5a9b6adc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 15:48:26 +02:00
tjenssen
bbfc49fe4d Prepare Qt Creator to have a flexible settings-path.
Change-Id: I4fcb5cbf36013eb5ba9c93155a167ee7f097627b
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 12:18:00 +02:00
Daniel Teske
5195f855db Android Toolchain: Remove unused member variable
Change-Id: I5029c6897298ef3f35079b6990dbbe4242789c42
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 16:43:50 +02:00
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 14:32:08 +02:00
BogDan Vatra
77801df3f8 Fix Android strip procedure
Change-Id: I92477f12fd125385bc23cf9b8cdf41ea701f9ef9
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-04-29 17:07:04 +02:00
Thiago Macieira
977c983bde Fix build on Unix.
sleep(3) is defined on unistd.h, so you need to include it.

/home/thiago/src/qt/creator/src/plugins/android/androidconfigurations.cpp(556): error: identifier "sleep" is undefined

Change-Id: I71c76bd7f085240d9e3ceaad1ac062387cf7c838
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-26 12:58:40 +02:00
Daniel Teske
f3b2ca7d19 Add qbs files for android
Change-Id: I1739879579245303795fc7c6d5bc2206ffb44bcb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-25 15:57:48 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-25 11:49:19 +02:00
Tobias Hunger
9e15264544 Whitespace fixes
Change-Id: I5e9213a3cc39417d4585ae52a30d1aec450b5579
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-24 15:59:03 +02:00
Robert Loehning
9283d7d50f Compile fix
Change-Id: Ic323f2fc1274128edf367305f690807eea73e366
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-24 14:21:24 +02:00
Daniel Teske
1dc89a6c55 Android pluginspec: Fix the last commit, add a missing "
Change-Id: I3e9da968b5e657c5ceb22dd40aa185accf11c656
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-24 13:57:24 +02:00
Daniel Teske
ab96b85176 Mark Android plugin as experimental
That disables it by default, pass ANDROID_ENABLE to qmake -r to change the
default. The plugin is always built, thus it can be enabled/disabled in the
settings.

Change-Id: I29894f0fe1672a1920b43d38999717ce8b48868f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-24 13:46:31 +02:00
hjk
6aaed915e4 android: compile with namespaces
Change-Id: I964b0bb567bbc45eb5e68e1a7cc892c0757d4ffd
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-24 13:21:35 +02:00
BogDan Vatra
50e8f7bb7b Android plugin
Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-24 12:25:40 +02:00