diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qttools')
| -rw-r--r-- | meta/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | 158 | ||||
| -rw-r--r-- | meta/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch (renamed from meta/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch) | 4 | ||||
| -rw-r--r-- | meta/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch (renamed from meta/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch) | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt5/qttools/run-ptest | 4 |
5 files changed, 190 insertions, 7 deletions
diff --git a/meta/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/meta/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch new file mode 100644 index 0000000000..9a3e9e2afb --- /dev/null +++ b/meta/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -0,0 +1,158 @@ +From 517561c76fcd0d5174d6b138d1c5d3ca5ee48981 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.jansa@gmail.com> +Date: Wed, 11 Sep 2013 18:30:08 +0200 +Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert + +This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native +is built without GUI support (no-png is set) and we still want to build +native lrelease + lupdate + lconvert tools. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + examples/examples.pro | 3 ++- + src/designer/src/src.pro | 18 ++++++++++-------- + src/linguist/linguist.pro | 2 +- + src/src.pro | 16 +++++++++------- + tests/auto/auto.pro | 24 +++++++++++++----------- + 5 files changed, 35 insertions(+), 28 deletions(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 69365d1..da7b38b 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -1,4 +1,5 @@ + TEMPLATE = subdirs +-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant ++!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant ++qtHaveModule(widgets): SUBDIRS += linguist uitools + + winrt: SUBDIRS -= assistant designer +diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro +index 6915e34..3ff2eca 100644 +--- a/src/designer/src/src.pro ++++ b/src/designer/src/src.pro +@@ -1,13 +1,15 @@ + TEMPLATE = subdirs + +-SUBDIRS = \ +- uiplugin \ +- uitools \ +- lib \ +- components \ +- designer ++!linguistonly { ++ SUBDIRS = \ ++ uiplugin \ ++ lib \ ++ components \ ++ designer ++} ++SUBDIRS += uitools + +-contains(QT_CONFIG, shared): SUBDIRS += plugins ++!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins + + uitools.depends = uiplugin + lib.depends = uiplugin +@@ -15,7 +17,7 @@ components.depends = lib + designer.depends = components + plugins.depends = lib + +-qtNomakeTools( \ ++!linguistonly:qtNomakeTools( \ + lib \ + components \ + designer \ +diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro +index 3a70580..a977878 100644 +--- a/src/linguist/linguist.pro ++++ b/src/linguist/linguist.pro +@@ -3,7 +3,7 @@ SUBDIRS = \ + lrelease \ + lupdate \ + lconvert +-!no-png:qtHaveModule(widgets): SUBDIRS += linguist ++!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist + + qtNomakeTools( \ + linguist \ +diff --git a/src/src.pro b/src/src.pro +index 387d54f..56b7d0c 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -4,19 +4,21 @@ qtHaveModule(widgets) { + no-png { + message("Some graphics-related tools are unavailable without PNG support") + } else { +- SUBDIRS = assistant \ ++ !linguistonly { ++ SUBDIRS = assistant \ + pixeltool \ +- qtestlib \ +- designer ++ qtestlib ++ } ++ SUBDIRS += designer + + linguist.depends = designer + } + } + + SUBDIRS += linguist \ +- qdoc \ + qtplugininfo +-if(!android|android_app):!ios: SUBDIRS += qtpaths ++!linguistonly: SUBDIRS += qdoc ++if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths + + mac { + SUBDIRS += macdeployqt +@@ -26,11 +28,11 @@ android { + SUBDIRS += androiddeployqt + } + +-qtHaveModule(dbus): SUBDIRS += qdbus ++!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus + + win32|winrt:SUBDIRS += windeployqt + winrt:SUBDIRS += winrtrunner +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag ++!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag + + qtNomakeTools( \ + pixeltool \ +diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro +index 20b5fec..8a42d1f 100644 +--- a/tests/auto/auto.pro ++++ b/tests/auto/auto.pro +@@ -1,15 +1,17 @@ + TEMPLATE=subdirs +-SUBDIRS=\ +- linguist \ +- qhelpcontentmodel \ +- qhelpenginecore \ +- qhelpgenerator \ +- qhelpindexmodel \ +- qhelpprojectdata \ +- cmake \ +- installed_cmake \ +- qtdiag \ +- windeployqt ++!linguistonly { ++ SUBDIRS=\ ++ linguist \ ++ qhelpcontentmodel \ ++ qhelpenginecore \ ++ qhelpgenerator \ ++ qhelpindexmodel \ ++ qhelpprojectdata \ ++ cmake \ ++ installed_cmake \ ++ qtdiag \ ++ windeployqt ++} + + installed_cmake.depends = cmake + diff --git a/meta/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/meta/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch new file mode 100644 index 0000000000..57a995691c --- /dev/null +++ b/meta/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch @@ -0,0 +1,29 @@ +From 3e79a7ac0e1f77544283efe73baa98b2e205e7e0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Fri, 17 Jan 2014 14:33:19 +0100 +Subject: [PATCH] assistant/help: fix linking of dependent libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +else we get: +| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link) +| ...undefined reference to `QCLucenePhraseQuery::getTerms() const' + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + src/assistant/help/help.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro +index 37d5ba4..8de8763 100644 +--- a/src/assistant/help/help.pro ++++ b/src/assistant/help/help.pro +@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \ + qhelpsearchindexreader_clucene_p.h + + load(qt_module) ++ ++LIBS += -lQt5CLucene diff --git a/meta/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/meta/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index 7a081a1cfe..1c6d8b82aa 100644 --- a/meta/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/meta/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From 9557b7b0100c335b42503c3f3b6a9a193c3bf9cf Mon Sep 17 00:00:00 2001 +From 8058b3f26003a3fae25db08694ee0fe671c96bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH] add noqtwebkit configuration @@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 1374c07..28c45a2 100644 +index ef5c595..9c2dc1c 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@ diff --git a/meta/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/meta/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch index a4909f75fd..440539d5b2 100644 --- a/meta/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/meta/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,4 +1,4 @@ -From a260d3a5b1664027e09c7de368ee5e94d22ff8bf Mon Sep 17 00:00:00 2001 +From 1c5dd153433fed55e70ef208a3068075fa38f006 Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 9 Jul 2015 11:28:19 -0400 Subject: [PATCH] linguist-tools cmake: allow overriding the location for diff --git a/meta/recipes-qt/qt5/qttools/run-ptest b/meta/recipes-qt/qt5/qttools/run-ptest deleted file mode 100644 index 5cd5e27eb4..0000000000 --- a/meta/recipes-qt/qt5/qttools/run-ptest +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -./tst_qtdiag -./tst_qtattributionsscanner |