| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
translations/qtconfig_pl.ts
translations/qtconfig_ru.ts
Change-Id: I79eb321dac96c67e1abf7af78238ec415a3236fb
|
| |
| |
| |
| |
| |
| |
| | |
There is no qtconfig tool in Qt 5.
Change-Id: I7bcc041738425d4a253514589674b770b17cb458
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
they are final artifacts, so they should be deleted only by a distclean.
Task-number: QTBUG-42729
Change-Id: Ib0c024646e13faefa0e18c94e9464500063373e0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: If564bc735d31cbf5c64d6af7464c4bae18f02f64
|
| |
| |
| |
| |
| | |
Change-Id: I21ea10a160c2555eaf4da0da5eaeb08b49e4a922
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I89fc31f57ef12f258c886cd63d62faf972008470
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Id643be8c78e9143b0b1c8afa7ad4da9cf7f67d7e
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
instead, silently ignore them - they typically stem from missing
repositories (usually, the obsolete ones).
Change-Id: Iaec00f8e88e4977bd820d1b8c3b5b8d5be30c72b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|/
|
|
|
| |
Change-Id: I15a666feedb31cdc70a6115ed322cea7197eb62f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit aabb833032fa44c7 introduced _en.ts files that are auto-generated
in the build directory. However, $$files() in this case returns
absolute paths, which the text substition rules later on adds again.
Fix this by first removing the absolute path.
Task-number: QTBUG-49337
Change-Id: I245010121893e58145e43593b50a4e8209740ff0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Icefeaeb2918aeeffe5c3a4109783c005481eac3d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|\
| |
| |
| | |
Change-Id: I984770b869d735bc4d7cbd99242e944a47d588c0
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Add auto-generated _en.ts files to .gitignore.
- Let git do the globbing by passing the pattern on to git so that
git add will not bail out with error when encountering
a file listed in .gitignore.
Task-number: QTBUG-48075
Change-Id: I2ab328a9ef4574e15742af2dafecda52f795685a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: I31b78e8f66651ed4d27f5208a88ed62dcfd03a94
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Automatically generate empty _en.qm files. This allows the user to
use the QTranslator::load(QLocale) overload, e.g.
translator.load(QLocale(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
So far this has been using a non-English translation even if English
has a higher priority (for instance by setting LANGUAGE=en:de on Linux).
[ChangeLog][Translations] Qt modules now include an English translation
(_en.qm) file. This fixes the behavior of QTranslator::load(QLocale) if
English is just one of the configured languages.
Change-Id: Ibb9e721ef501fbf5cb231671e3b89ef27a68f0a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|/
|
|
|
|
| |
Change-Id: I5c1b63a0df3bc6d710eaddc91784d6c602631ae7
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I5a737f7bbc255a7c7bb6f80547863305c4f4e8ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|
|
|
|
|
|
| |
qt_??.ts files need to depend on both qtdeclarative and qtquickcontrols
Change-Id: Ib5c3b2c456828db09d3536c219b0b1840eaea645
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
|
|
|
|
|
| |
Change-Id: I3ef331489895571c403eacee04ac852cff51345d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: Iaba5a1ac28cc784e5d6d4e0d51cfe59387eb5194
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
| |
otherwise qt_module_pris.prf prints (totally correct) useless warnings.
Change-Id: I81052c8178b67ffffdd45eaf951ed7ac1e1e5fa3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-31727
Change-Id: I696a7423beffb3114ac6f6b2a5dcbb297801c5a0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
| |
there is no need to make this module "buildable" with visual studio, so
we just use the partly implemented aux TEMPLATE.
Change-Id: Ie7989c674ad6f854764ac2617123bb1150695148
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I6fa77812a19ea0bc453c12a89e627c6165a4902e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
some of the tools are already bootstrapped, and even more will be. as we
have no solution for the console encoding in bootstrapped apps, we don't
actually translate them. so the translations are simply wasted.
Change-Id: Id1b4849daea5b67bfd124e0a1f0b9b55a3289929
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
| |
Change-Id: I035f3fc4efabf4812b9f428f4ea26fe28d7a791c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
Do not scan help library for the application.
Change-Id: Id839fb2953d5abf492a8507d979a4605745e1907
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
| |
Change-Id: Ic051730cb2c5feff78765068151e7916d22f616f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
this includes a script to modularize the old qt_??.ts files.
Change-Id: I0fff36be18f5a9764d3ab1d2ee73e53cac43b979
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
| |
no need to specify a source module any more
Change-Id: Ie5ad576163c26057f20902a1131601622600cebe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
Remove translations for qvfb, which was part of qt/embedded.
Change-Id: If06e0dbbe06350295d40a58b5b392cf1f1a0143e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Install translators for the Qt & QmlViewer translations. also
add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for
untranslated strings.
Reviewed-by: Oswald Buddenhagen
Task-number: QTBUG-14848
(cherry picked from commit f33b31dcc1b8fd35501ab5b441a4529e2f8570f3)
|
| |
|
|
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://qt.gitorious.org/qt/pages/GitIntroductionWithQt
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
|