]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / qmake / qmake-native-2.00a / old-uic-compatibility.patch
1
2 #
3 # Patch managed by http://www.holgerschurig.de/patcher.html
4 #
5
6 --- qt-embedded-opensource-4.0.0-b1/mkspecs/features/uic.prf~old-uic-compatibility.patch
7 +++ qt-embedded-opensource-4.0.0-b1/mkspecs/features/uic.prf
8 @@ -13,8 +13,8 @@
9  isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR
10  isEmpty(UI_HEADERS_DIR):UI_HEADERS_DIR = $$UI_DIR
11  
12 -uic.commands = $$QMAKE_UIC -3 $$QMAKE_UIC3 ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
13 -uic.output = $$UI_HEADERS_DIR/ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
14 +uic.commands = $$QMAKE_UIC ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
15 +uic.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
16  uic.input = FORMS
17  uic.variable_out = HEADERS
18  uic.CONFIG += no_link
19 @@ -24,9 +24,9 @@
20  INCLUDEPATH += $$UI_HEADERS_DIR
21  
22  uic3 {
23 -    uic3_decl.commands = $$QMAKE_UIC3 -decl ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
24 +    uic3_decl.commands = $$QMAKE_UIC3 -decl ${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
25      uic3_decl.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
26 -    uic3_decl.depends = $$QMAKE_UIC3 $$UI_HEADERS_DIR/ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
27 +    uic3_decl.depends = $$QMAKE_UIC3 $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
28      uic3_decl.input = FORMS
29      uic3_decl.CONFIG += no_link
30      uic3_decl.variable_out = HEADERS