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

19 Commits

Author SHA1 Message Date
Tobias Hunger
96d8009693 Fix saving of xml files 
Do not save XML config files (profiles.xml, toolchains.xml, etc.)
if the file has not changed.

Change-Id: I5f0dea374b33a05e7c428f4031d53c83d92de595
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-08-24 15:48:40 +02:00
Tobias Hunger
61e95e9a99 Replace some QStrings with Utils::FileName 
Change-Id: Ia96963b90788250b4bc6bc89c2bb697de103535f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-24 11:27:05 +02:00
hjk
bab670af67 android: code cosmetics 
Fix whitespace, capitalization, naming, comments, add 'using'
in .cpp, remove 'using' in .h, remove unneeded Q_UNUSED, add
needed Q_UNUSED, etc.

Change-Id: Ibf9ba57850cbea1e79e152ec0165c8b01fa66567
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-12 22:40:41 +02:00
Friedemann Kleint
ee8e1122ba tr()-fixes for 2.6. 
- Fix typos and various capitalization errors.
- Fix wrong placeholders.
- Remove QCoreApplication::tr().
- Fix androidpackagecreationwidget.ui, remove translation
  from combo and clean up some HTML markup.

Change-Id: I51bcdad90c770c0f861a9d17e92b9c9222c6e8bf
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-08-01 17:19:02 +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
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
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
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
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
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
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
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
Robert Loehning
9283d7d50f Compile fix 
Change-Id: Ic323f2fc1274128edf367305f690807eea73e366
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-24 14:21:24 +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