diff options
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch index 9bccd40d71..147c2498f8 100644 --- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch +++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | |||
@@ -11,9 +11,11 @@ Upstream-Status: Inappropriate [embedded specific] | |||
11 | 11 | ||
12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
13 | 13 | ||
14 | --- a/Modules/FindQt4.cmake | 14 | Index: cmake-2.8.5-rc3/Modules/FindQt4.cmake |
15 | +++ b/Modules/FindQt4.cmake | 15 | =================================================================== |
16 | @@ -461,7 +461,7 @@ | 16 | --- cmake-2.8.5-rc3.orig/Modules/FindQt4.cmake 2011-06-27 14:41:05.000000000 +0000 |
17 | +++ cmake-2.8.5-rc3/Modules/FindQt4.cmake 2011-07-08 15:31:58.057170949 +0000 | ||
18 | @@ -473,7 +473,7 @@ | ||
17 | # check for qmake | 19 | # check for qmake |
18 | # Debian uses qmake-qt4 | 20 | # Debian uses qmake-qt4 |
19 | # macports' Qt uses qmake-mac | 21 | # macports' Qt uses qmake-mac |
@@ -22,77 +24,77 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | |||
22 | "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" | 24 | "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" |
23 | "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" | 25 | "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" |
24 | "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" | 26 | "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" |
25 | @@ -988,13 +988,13 @@ | 27 | @@ -944,13 +944,13 @@ |
26 | ENDIF(QT_QMAKE_CHANGED) | 28 | ENDIF(QT_QMAKE_CHANGED) |
27 | 29 | ||
28 | FIND_PROGRAM(QT_MOC_EXECUTABLE | 30 | FIND_PROGRAM(QT_MOC_EXECUTABLE |
29 | - NAMES moc-qt4 moc | 31 | - NAMES moc-qt4 moc |
30 | + NAMES moc-qt4 moc4 moc | 32 | + NAMES moc-qt4 moc4 moc |
31 | PATHS ${QT_BINARY_DIR} | 33 | PATHS ${QT_BINARY_DIR} |
32 | NO_DEFAULT_PATH | 34 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
33 | ) | 35 | ) |
34 | 36 | ||
35 | FIND_PROGRAM(QT_UIC_EXECUTABLE | 37 | FIND_PROGRAM(QT_UIC_EXECUTABLE |
36 | - NAMES uic-qt4 uic | 38 | - NAMES uic-qt4 uic |
37 | + NAMES uic-qt4 uic4 uic | 39 | + NAMES uic-qt4 uic4 uic |
38 | PATHS ${QT_BINARY_DIR} | 40 | PATHS ${QT_BINARY_DIR} |
39 | NO_DEFAULT_PATH | 41 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
40 | ) | 42 | ) |
41 | @@ -1006,49 +1006,49 @@ | 43 | @@ -962,49 +962,49 @@ |
42 | ) | 44 | ) |
43 | 45 | ||
44 | FIND_PROGRAM(QT_RCC_EXECUTABLE | 46 | FIND_PROGRAM(QT_RCC_EXECUTABLE |
45 | - NAMES rcc | 47 | - NAMES rcc |
46 | + NAMES rcc4 rcc | 48 | + NAMES rcc4 rcc |
47 | PATHS ${QT_BINARY_DIR} | 49 | PATHS ${QT_BINARY_DIR} |
48 | NO_DEFAULT_PATH | 50 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
49 | ) | 51 | ) |
50 | 52 | ||
51 | FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE | 53 | FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE |
52 | - NAMES qdbuscpp2xml | 54 | - NAMES qdbuscpp2xml |
53 | + NAMES qdbuscpp2xml4 qdbuscpp2xml | 55 | + NAMES qdbuscpp2xml4 qdbuscpp2xml |
54 | PATHS ${QT_BINARY_DIR} | 56 | PATHS ${QT_BINARY_DIR} |
55 | NO_DEFAULT_PATH | 57 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
56 | ) | 58 | ) |
57 | 59 | ||
58 | FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE | 60 | FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE |
59 | - NAMES qdbusxml2cpp | 61 | - NAMES qdbusxml2cpp |
60 | + NAMES qdbusxml2cpp4 qdbusxml2cpp | 62 | + NAMES qdbusxml2cpp4 qdbusxml2cpp |
61 | PATHS ${QT_BINARY_DIR} | 63 | PATHS ${QT_BINARY_DIR} |
62 | NO_DEFAULT_PATH | 64 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
63 | ) | 65 | ) |
64 | 66 | ||
65 | FIND_PROGRAM(QT_LUPDATE_EXECUTABLE | 67 | FIND_PROGRAM(QT_LUPDATE_EXECUTABLE |
66 | - NAMES lupdate-qt4 lupdate | 68 | - NAMES lupdate-qt4 lupdate |
67 | + NAMES lupdate-qt4 lupdate4 lupdate | 69 | + NAMES lupdate-qt4 lupdate4 lupdate |
68 | PATHS ${QT_BINARY_DIR} | 70 | PATHS ${QT_BINARY_DIR} |
69 | NO_DEFAULT_PATH | 71 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
70 | ) | 72 | ) |
71 | 73 | ||
72 | FIND_PROGRAM(QT_LRELEASE_EXECUTABLE | 74 | FIND_PROGRAM(QT_LRELEASE_EXECUTABLE |
73 | - NAMES lrelease-qt4 lrelease | 75 | - NAMES lrelease-qt4 lrelease |
74 | + NAMES lrelease-qt4 lrelease4 lrelease | 76 | + NAMES lrelease-qt4 lrelease4 lrelease |
75 | PATHS ${QT_BINARY_DIR} | 77 | PATHS ${QT_BINARY_DIR} |
76 | NO_DEFAULT_PATH | 78 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
77 | ) | 79 | ) |
78 | 80 | ||
79 | FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE | 81 | FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE |
80 | - NAMES qcollectiongenerator-qt4 qcollectiongenerator | 82 | - NAMES qcollectiongenerator-qt4 qcollectiongenerator |
81 | + NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator | 83 | + NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator |
82 | PATHS ${QT_BINARY_DIR} | 84 | PATHS ${QT_BINARY_DIR} |
83 | NO_DEFAULT_PATH | 85 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
84 | ) | 86 | ) |
85 | 87 | ||
86 | FIND_PROGRAM(QT_DESIGNER_EXECUTABLE | 88 | FIND_PROGRAM(QT_DESIGNER_EXECUTABLE |
87 | - NAMES designer-qt4 designer | 89 | - NAMES designer-qt4 designer |
88 | + NAMES designer-qt4 designer4 designer | 90 | + NAMES designer-qt4 designer4 designer |
89 | PATHS ${QT_BINARY_DIR} | 91 | PATHS ${QT_BINARY_DIR} |
90 | NO_DEFAULT_PATH | 92 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
91 | ) | 93 | ) |
92 | 94 | ||
93 | FIND_PROGRAM(QT_LINGUIST_EXECUTABLE | 95 | FIND_PROGRAM(QT_LINGUIST_EXECUTABLE |
94 | - NAMES linguist-qt4 linguist | 96 | - NAMES linguist-qt4 linguist |
95 | + NAMES linguist-qt4 linguist4 linguist | 97 | + NAMES linguist-qt4 linguist4 linguist |
96 | PATHS ${QT_BINARY_DIR} | 98 | PATHS ${QT_BINARY_DIR} |
97 | NO_DEFAULT_PATH | 99 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
98 | ) | 100 | ) |