blob: 68415547639d178f30af3f812a2ad69e744ec722 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 10b8b523869124d2fc8cd98d9e028c0bcffd61b1 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 12 May 2011 15:36:03 +0000
4Subject: [PATCH 1/2] cmake: support OpenEmbedded Qt4 tool binary names
Patrick Williamsc124f4f2015-09-15 14:41:29 -05005
6The FindQt4 module looks for Qt4 binaries to be able to gather the
7paths used for compilation and also to be using during other processes
8(translation update, translation binary generating and like) however
9OpenEmbedded has renamed those to allow old QMake to be used in
10parallel with the current one. This patch adds support for the
11OpenEmbedded specific binary names.
12
13Upstream-Status: Inappropriate [embedded specific]
14
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16
17The patch was slightly adapted in order to match cmake 3.2.2:
18Instead of find_program, _find_qt4_program is now used.
19
20Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
Brad Bishop316dfdd2018-06-25 12:45:53 -040021
Patrick Williamsc124f4f2015-09-15 14:41:29 -050022---
23 Modules/FindQt4.cmake | 10 +++++-----
24 1 file changed, 5 insertions(+), 5 deletions(-)
25
26diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
Brad Bishop316dfdd2018-06-25 12:45:53 -040027index c67d0be..0cf169b 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050028--- a/Modules/FindQt4.cmake
29+++ b/Modules/FindQt4.cmake
Brad Bishop316dfdd2018-06-25 12:45:53 -040030@@ -516,7 +516,7 @@ endfunction()
Patrick Williamsc124f4f2015-09-15 14:41:29 -050031
32 set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
33
34-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
35+set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac)
36 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
37
38 if (QT_QMAKE_EXECUTABLE AND
Brad Bishop316dfdd2018-06-25 12:45:53 -040039@@ -1142,12 +1142,12 @@ if (QT_QMAKE_EXECUTABLE AND
Patrick Williamsc124f4f2015-09-15 14:41:29 -050040 _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
41 _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
42 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
43- _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)
44- _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml)
45- _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp)
46+ _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc4 rcc)
47+ _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml4 qdbuscpp2xml)
48+ _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp4 qdbusxml2cpp)
49 _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4 lupdate)
50 _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease4 lrelease)
51- _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator)
52+ _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4)
53 _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer)
54 _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist)
55
56--
Brad Bishop316dfdd2018-06-25 12:45:53 -0400572.7.4
Patrick Williamsc124f4f2015-09-15 14:41:29 -050058