summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Doc: remove details about i18n from Qt Linguist ManualLeena Miettinen2013-04-152-308/+47
| | | | | | | | Add links to topics that describe i18n in detail for C++ and QML. Change-Id: I47b95b040dd9efe4eb8951dedbf94ab8988316e5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: rewrite Translators topic in Qt Linguist ManualLeena Miettinen2013-04-1229-733/+351
| | | | | | | | | | | Make the topic task-oriented. Move information around and remove redundancy. Check the paths to commands and availability of commands. Make docs reflect some changes in functionality. Remove images of toobar buttons that are no longer referred to in text. Change-Id: I7f9743d35ceebfc0f7097a1af2e12eeb344c8e58 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: replace "balloon help" with "tooltips"Leena Miettinen2013-04-111-1/+1
| | | | | | | In the Qt Linguist Manual. Change-Id: I4ec995afa821d786535a140730187058665e029c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: add link to Internationalization with QtLeena Miettinen2013-04-111-0/+3
| | | | | | | To the Qt Linguist Manual. Change-Id: I55b3ccb8fe04b6997c3ce953de6544a193b3548e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix plugin export macros in Qt Designer documentation.Friedemann Kleint2013-04-101-3/+2
| | | | | | | | | Use Q_PLUGIN_METADATA instead of Q_EXPORT_PLUGIN2 . Task-number: QTBUG-30508 Change-Id: Iedc1e140d3f597e29911a38e5d5548e6ac9981b3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: move release management task list in Qt Linguist ManualLeena Miettinen2013-04-101-26/+27
| | | | | | | | Move the description of the release process from the Developer chapter to the Release Manager chapter. Change-Id: Ia119e57b090d10d23b875120b1394be1c89b8405 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QUiLoader/Designer: Fix gcc 4.8 warnings about unused typedefs.Friedemann Kleint2013-04-062-4/+0
| | | | | Change-Id: I792f3060c808ef860b31b47b3b00e5ac1991eedd Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-032-1/+26
|\ | | | | | | | | | | | | Conflicts: src/assistant/assistant/assistant.pro Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0
| * Assistant: Fix static linking on Windows.v5.0.2Friedemann Kleint2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | Check for existence of sqlite-plugin. Breakage introduced by d73afeeafc7df8192508c1a5617944d303d5a0a2 . Change-Id: I2595ed4d80e0804f1c2503cddf94ca15e4922af9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Assistant: Fix static linking for Linux.Friedemann Kleint2013-03-262-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()' The import for the DB plugin should now be generated by qmake. Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> (cherry picked from commit f212e46fe930ee89a8cb52beeeccc03369c015a1) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+25
| | | | | | | | | | | | Change-Id: I7c55f4441aa671fc320113a95b74e4b1bdbd689a Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Generate the Qt5LinguistConfig.cmake files independent of QtUiTools.Stephen Kelly2013-03-273-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generation relied on the uitools module for the version, so if it was not available, we got errors like this: WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake' WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake' WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake' http://testresults.qt-project.org/ci/QtTools_stable_Integration/build_00128/linux-g++_no-widgets_Ubuntu_12.04_x64/log.txt.gz Use MODULE_VERSION for the version instead and MODULE_BASE_OUTDIR for the generation location. Change-Id: I9daa6878553015e841b6e41fd1f64eb60ada7774 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | Change-Id: I1f48216fd27e40d70ffd020ed1b880b03df0bf12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: edit Qt Linguist Manual for styleLeena Miettinen2013-03-251-17/+21
| | | | | | | | | | | | | | | | Replaced "e.g." with "for example" and "etc" with "and so on". Removed contractions. Removed some extra spaces. Change-Id: Ic0b9d5df2ee7f7bb080abb002027546f0fc6da4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: move Qt Linguist overview informationLeena Miettinen2013-03-231-14/+23
| | | | | | | | | | | | | | From front page to a separate topic. Change-Id: Idc9a599e0c8f095b0d6d63fd74b43848a8b13d3d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-20133-1997/+185
|\ \ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918
| * | make lupdate a host toolOswald Buddenhagen2013-03-192-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lupdate makes no sense on x-built targets at all. though one may also argue whether it makes sense to actually bootstrap it - while its use may be supported by the build system, it's typically not part of regular builds, but rather used shortly before running linguist - for which a host build of qt is necessary anyway. one argument for bootstrapping is that it uses the qmldevtools library, which logically should be bootstrapped (the only other current user is qmlmin, which definitely *is* used in regular builds and thus needs bootstrapping). Change-Id: Ia3ddd901fe2b0c2b7b77af7f1ebc66d757fc7783 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | make lconvert a host toolOswald Buddenhagen2013-03-192-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | it's a build tool, so it should be built for the host. Change-Id: I55baee65d3e91bf5189c10f30e23975abfc4de10 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | make lrelease only optionally bootstrappedOswald Buddenhagen2013-03-192-2/+2
| | | | | | | | | | | | | | | | | | | | | qt_tool.prf handles the magic for us. Change-Id: Ifb8e7fd7ff0e46b9b274c9d156e048e89586ab2c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | fix translation contextsOswald Buddenhagen2013-03-198-28/+10
| | | | | | | | | | | | | | | | | | | | | | | | the bootstrapped library now fakes the translation api sufficiently well to enable unifying the usage. Change-Id: I6a5d7cb1bb67830f1ea0a732566ebee354d62e7e Reviewed-by: hjk <hjk121@nokiamail.com>
| * | support only utf-8 and utf-16 for source codeOswald Buddenhagen2013-03-195-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | utf-16 is optionally used by java and msvc. it doesn't hurt to support it. all other encodings are not used anyway (other than 8-bit pass-through, but this is a matter for (the also removed) CodecForTr). Change-Id: Ie6482e187a9a8276918b53e97faeac88a40eb52c Reviewed-by: hjk <hjk121@nokiamail.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-147-6/+11
| |\ \ | | | | | | | | | | | | Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
| * | | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-133-603/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I629046a2a7aa0611cda4f04f8d6253d5db4e05a3 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | | purge CODECFORTR & -codecfortr supportOswald Buddenhagen2013-03-1254-882/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-based code is expected to be utf8-encoded nowadays. the respective c++ interfaces have been purged in 5.0 already. Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * | | purge ui3 support from lupdateOswald Buddenhagen2013-03-123-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is no qt3support in qt 5 any more. Change-Id: I9da9c209095a753d45419fb34a5737cd8dde4dc4 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | | purge TS 1.1 supportOswald Buddenhagen2013-03-125-166/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at the time of release it will be almost five years since we introduced TS 2.0 and stopped writing 1.1 by default, so there shouldn't be much of a need to write such files any more - and this commit doesn't even remove 1.1 reading capability (because it comes for free so far). Change-Id: Ie54fe31f83733ef944306c01301c0ec0e9bcb8bf Reviewed-by: hjk <hjk121@nokiamail.com>
| * | | Aero-Style-QWizard: Remove special handling in Qt Designer.Friedemann Kleint2013-03-111-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wizard now behaves nicely when used as a child widget. Task-number: QTBUG-29904 Change-Id: I2e9705eb4197b3411c9e072d0d5c05a97df8d47f Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | | Fix warning about superfluous parentheses (CLANG).Friedemann Kleint2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0fa2c6d5bf04bb3cf9d0314207ccb0a21b928f22 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| * | | Qt Designer: Remove unused code (detect by CLANG).Friedemann Kleint2013-03-061-29/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idf1da5c69f90e4ce94319fc722180988cbc44dc5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| * | | Fix moving widgets in horizontal layouts in RTL mode.Friedemann Kleint2013-03-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-25872 Change-Id: Ia311b88f0ed3450d798bc5a9136e978c642d5b25 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| * | | Active X plugin: Fix setting a control by task menu.Friedemann Kleint2013-03-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The property is a QString when set by the menu or a PropertySheetStringValue when loading the form. Breakage introduced by 8695c1753964eeb06b5d9306010b56be5fc151c0 . Task-number: QTBUG-29234 Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Jocelyn Turcotte2013-03-015-30/+0
| |\ \ \ | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-255-30/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ic736c7169dc07599f43ee8317cca78da42131e1a
| * | | | | HTML improvementRobert Loehning2013-03-011-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: If70901325b3f4d5cbda705e4261fc18ea97c1bc0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * | | | Rich text editor: Add support for Right-to-Left blocks.Friedemann Kleint2013-02-203-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9502 Change-Id: Ic1b0e4abdf71022609a90fc00f29e493958d9feb Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| * | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1845-127/+64103
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0
| * | | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2857-222/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Change-Id: I208ae87694deeb4edc73bb1a4be314c30861910f Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | | | ActiveQt Designer plugin: Load control string correctly.Friedemann Kleint2013-01-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29234 Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| * | | | | Qt Designer: Use multiline validation for dynamic string properties.Friedemann Kleint2013-01-211-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-26394 Change-Id: Idbaa4bad71125b74d8407bb56ee9fdbf83831fe0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| * | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-171319-2068/+4705
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
| * | | | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: I40b8d45fa5f6106912ad0a5f9ae69fae7b9ec660 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | | | | Replace deprecated QPixmap::grabWindow() by QScreen::grabWindow().Friedemann Kleint2012-12-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ca2576c5553d37cf25fcfd2934ade0d1bcb7fb0 Reviewed-by: hjk <qthjk@ovi.com>
| * | | | | | pixeltool: Display cursor position in title bar for measurements.Friedemann Kleint2012-12-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibc6d92dc9fb52989ea4d82e971cfc215d3f49f33 Reviewed-by: hjk <qthjk@ovi.com>
* | | | | | | Assistant: Fix static linking for Linux.Friedemann Kleint2013-03-192-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()' The import for the DB plugin should now be generated by qmake. Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | | | | | | Run the qttools cmake module tests only if QtWidgets is available.Stephen Kelly2013-03-141-2/+4
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26847e3347cf24664ca52488ddf521c923e37912 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | | | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Stephen Kelly2013-03-132-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | refs/staging/stable
| * \ \ \ \ \ Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-122-1/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | Change-Id: I4c19a5f76b8605134aeab29130a20df187f8f107
| | * | | | | Enable Active-X plugin in Qt Designer.Friedemann Kleint2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29733 Change-Id: I290c476d1ba84ca6ff519aa9d437d28e4ea066d8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| | * | | | | define MODULE_VERSIONOswald Buddenhagen2013-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: If7a85b5bf9701b1f804091b645b7de6554d4a27d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | | | | Merge branch 'stable' into releaseJohanna Aijala2013-02-211238-1474/+65566
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997
View Lorry Controller Status