diff options
Diffstat (limited to 'recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch')
-rw-r--r-- | recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch new file mode 100644 index 00000000..f1b87835 --- /dev/null +++ b/recipes-qt/qt5/qttools-5.1.0/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -0,0 +1,136 @@ +From 4df58d96ea516358d2762a219c0b196e56c8e89b 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 | 4 ++-- + src/designer/src/src.pro | 16 +++++++++------- + src/linguist/linguist.pro | 2 +- + src/src.pro | 10 ++++++---- + tests/auto/auto.pro | 20 +++++++++++--------- + 5 files changed, 29 insertions(+), 23 deletions(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 4955969..8e86419 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -1,3 +1,3 @@ + TEMPLATE = subdirs +-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant +- ++!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant ++qtHaveModule(widgets): SUBDIRS += linguist uitools +diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro +index e02ca8e..49527c5 100644 +--- a/src/designer/src/src.pro ++++ b/src/designer/src/src.pro +@@ -1,18 +1,20 @@ + TEMPLATE = subdirs + +-SUBDIRS = \ +- uitools \ +- lib \ +- components \ +- designer ++!linguistonly { ++ SUBDIRS = \ ++ lib \ ++ components \ ++ designer ++} ++SUBDIRS += uitools + +-contains(QT_CONFIG, shared): SUBDIRS += plugins ++!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins + + 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 df3c0c7..75bdf26 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 c8756db..d71c4a0 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -4,10 +4,12 @@ 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 + # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig + + linguist.depends = designer +@@ -20,7 +22,7 @@ mac { + SUBDIRS += macdeployqt + } + +-qtHaveModule(dbus): SUBDIRS += qdbus ++!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus + + qtNomakeTools( \ + pixeltool \ +diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro +index 074aa34..a744d46 100644 +--- a/tests/auto/auto.pro ++++ b/tests/auto/auto.pro +@@ -1,13 +1,15 @@ + TEMPLATE=subdirs +-SUBDIRS=\ +- linguist \ +- host.pro \ +- qhelpcontentmodel \ +- qhelpenginecore \ +- qhelpgenerator \ +- qhelpindexmodel \ +- qhelpprojectdata \ +- cmake ++!linguistonly { ++ SUBDIRS=\ ++ linguist \ ++ host.pro \ ++ qhelpcontentmodel \ ++ qhelpenginecore \ ++ qhelpgenerator \ ++ qhelpindexmodel \ ++ qhelpprojectdata \ ++ cmake ++} + + # These tests don't make sense for cross-compiled builds + cross_compile:SUBDIRS -= host.pro +-- +1.8.3.2 + |