diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:02:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:02:57 +0100 |
| commit | a104c706a4544fcab8f79c2783ff061826df0047 (patch) | |
| tree | f7c0260bc9e81e58099ace9f500048cbbc247950 | |
| parent | b26b3e6c713b6f3b6f5b9b6a010763724c69b0ec (diff) | |
| parent | c0daf8bdf0e05244a1beaf45ebb831326aac5a57 (diff) | |
Merge remote-tracking branch 'origin/dev' into stablev5.3.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I34952065d8370a34e68971d8506dfed385b649cb
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rwxr-xr-x | translations/check-ts.pl | 3 | ||||
| -rw-r--r-- | translations/translations.pro | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 5d8fd36..16328b7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.2.2 +MODULE_VERSION = 5.3.0 diff --git a/translations/check-ts.pl b/translations/check-ts.pl index 2eccd15..29d917b 100755 --- a/translations/check-ts.pl +++ b/translations/check-ts.pl @@ -45,7 +45,8 @@ use strict; my @groups = ( "qtbase", "qtdeclarative", "qtxmlpatterns", "qtmultimedia", "qtscript", "qtquick1", -# "qtdocgallery", "qtlocation", "qtpim", "qtsystems", + "qtlocation", "qtconnectivity", +# "qtdocgallery", "qtpim", "qtsystems", "assistant", "designer", "linguist", "qt_help", "qtconfig", "qmlviewer" ); diff --git a/translations/translations.pro b/translations/translations.pro index 02b294b..db0e505 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -50,11 +50,11 @@ addTsTargets(qtxmlpatterns, qtxmlpatterns/src/src.pro) #addTsTargets(qtwebkit, qtwebkit/WebKit.pro) # messages from test browser only #addTsTargets(qt3d, qt3d/src/src.pro) # empty except one dubious error message -#addTsTargets(qtconnectivity, qtconnectivity/src/src.pro) # just 2 error messages +addTsTargets(qtconnectivity, qtconnectivity/src/src.pro) #addTsTargets(qtdocgallery, qtdocgallery/src/src.pro) # dead module #addTsTargets(qtfeedback, qtfeedback/src/src.pro) # empty #addTsTargets(qtjsondb, qtjsondb/src/src.pro) # dead module, just 3 error messages -#addTsTargets(qtlocation, qtlocation/src/src.pro) # not part of 5.0 +addTsTargets(qtlocation, qtlocation/src/src.pro) #addTsTargets(qtpim, qtpim/src/src.pro) # not part of 5.0 #addTsTargets(qtsensors, qtsensors/src/src.pro) # empty #addTsTargets(qtsystems, qtsystems/src/src.pro) # not part of 5.0 |