Commit Graph

6 Commits

Author SHA1 Message Date
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