diff options
Diffstat (limited to 'recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch')
| -rw-r--r-- | recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index 0479bec9..e668edd9 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -1,7 +1,7 @@ -From 5eb3dd427bca8bbc13b7554e8e21993b2fc708e7 Mon Sep 17 00:00:00 2001 +From f4eb217f9b706a13e7f8256b8540970cfc78d805 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 1/2] Allow to build only lrelease + lupdate + lconvert +Subject: [PATCH 1/3] 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 @@ -9,7 +9,7 @@ native lrelease + lupdate + lconvert tools. Upstream-Status: Pending -Signed-off-by: Martin Jansa <Martin.jansa@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- examples/examples.pro | 4 ++-- src/designer/src/src.pro | 16 +++++++++------- @@ -74,7 +74,7 @@ index 3a70580..a977878 100644 qtNomakeTools( \ linguist \ diff --git a/src/src.pro b/src/src.pro -index a07a3bb..4c6b463 100644 +index a486d65..3aeac1e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,10 +4,12 @@ qtHaveModule(widgets) { @@ -98,11 +98,11 @@ index a07a3bb..4c6b463 100644 SUBDIRS += linguist -if(!android|android_app):!ios: SUBDIRS += qtpaths -+!linguistonly:if(!android|android_app):!ios: SUBDIRS += qtpaths ++if(!android|android_app):!linguistonly:!ios: SUBDIRS += qtpaths mac { SUBDIRS += macdeployqt -@@ -25,7 +27,7 @@ android { +@@ -25,11 +27,11 @@ android { SUBDIRS += androiddeployqt } @@ -111,12 +111,11 @@ index a07a3bb..4c6b463 100644 win32|winrt:SUBDIRS += windeployqt winrt:SUBDIRS += winrtrunner qtd3dservice -@@ -36,4 +38,4 @@ qtNomakeTools( \ - macdeployqt \ - ) +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag ++!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag --!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag -+!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag + qtNomakeTools( \ + pixeltool \ diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c3acfe3..f2f88f7 100644 --- a/tests/auto/auto.pro @@ -151,5 +150,5 @@ index c3acfe3..f2f88f7 100644 installed_cmake.depends = cmake -- -1.9.3 +2.0.0 |