import clean BK tree at cset 1.3670

4 files changed, 136 insertions, 0 deletions

diff --git a/packages/qmake/qmake-native-2.00a/.mtn2git_empty b/packages/qmake/qmake-native-2.00a/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qmake/qmake-native-2.00a/.mtn2git_empty
diff --git a/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf b/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf
index e69de29bb2..d803f036fc 100644
--- a/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf
+++ b/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf
@@ -0,0 +1,90 @@
+#
+# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org
+#
+
+MAKEFILE_GENERATOR	= UNIX
+TEMPLATE		= app
+CONFIG			+= qt warn_on release incremental link_prl
+QT                      += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+QMAKE_CC		= $(OE_QMAKE_CC)
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		=
+QMAKE_YACC		= yacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+QMAKE_YACC_HEADER       = $base.tab.h
+QMAKE_YACC_SOURCE       = $base.tab.c
+QMAKE_CFLAGS		= -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA)
+QMAKE_CFLAGS_DEPS	= -M
+QMAKE_CFLAGS_WARN_ON	= -Wall -W
+QMAKE_CFLAGS_WARN_OFF	=
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+QMAKE_CFLAGS_DEBUG	= -g
+QMAKE_CFLAGS_SHLIB	= -fPIC
+QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+
+QMAKE_CXX		= $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
+QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+
+QMAKE_INCDIR		=
+QMAKE_LIBDIR		=
+QMAKE_INCDIR_X11	= $(OE_QMAKE_INCDIR_X11)
+QMAKE_LIBDIR_X11	= $(OE_QMAKE_LIBDIR_X11)
+QMAKE_INCDIR_QT		= $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT		= $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL	=
+QMAKE_LIBDIR_OPENGL	=
+
+QMAKE_LINK		= $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
+QMAKE_LFLAGS		= $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
+QMAKE_LFLAGS_RELEASE	=
+QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_RPATH             = -Wl,-rpath-link,
+
+QMAKE_LIBS		= $(LIBS_EXTRA)
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11		= $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM	=  
+QMAKE_LIBS_QT		= -l$(OE_QMAKE_LIBS_QT)
+QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt
+QMAKE_LIBS_QT_OPENGL	= -lqgl
+QMAKE_LIBS_THREAD       = -lpthread
+
+QMAKE_MOC		= $(OE_QMAKE_MOC)
+QMAKE_UIC		= $(OE_QMAKE_UIC)
+
+QMAKE_AR		= $(OE_QMAKE_AR) cqs
+QMAKE_RANLIB		=
+
+QMAKE_TAR		= tar -cf
+QMAKE_GZIP		= gzip -9f
+
+QMAKE_COPY		= cp -f
+QMAKE_COPY_FILE         = $(COPY)
+QMAKE_COPY_DIR          = $(COPY) -r
+QMAKE_MOVE		= mv -f
+QMAKE_DEL_FILE		= rm -f
+QMAKE_DEL_DIR		= rmdir
+QMAKE_STRIP             = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB	+= --strip-unneeded
+QMAKE_CHK_DIR_EXISTS	= test -d
+QMAKE_MKDIR		= mkdir -p
+
diff --git a/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch b/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch
index e69de29bb2..866864ad1f 100644
--- a/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch
+++ b/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-embedded-opensource-4.0.0-b1/qmake/generators/makefile.cpp~old-moc-compatibility.patch
++++ qt-embedded-opensource-4.0.0-b1/qmake/generators/makefile.cpp
+@@ -950,7 +950,7 @@
+                 deps += "$(MOC) ";
+             deps += (*it) + " " + findDependencies((m)).join(" ");
+             t << m << ": " << deps << "\n\t"
+-              << "$(MOC)" << " $(DEFINES) $(INCPATH) " << varGlue("QMAKE_COMPILER_DEFINES","-D"," -D"," ")
++              << "$(MOC) " /* << " $(DEFINES) $(INCPATH) " << varGlue("QMAKE_COMPILER_DEFINES","-D"," -D"," ") */
+               << (*it) << " -o " << m << endl << endl;
+         }
+     }
diff --git a/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch b/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch
index e69de29bb2..3a985600fa 100644
--- a/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch
+++ b/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch
@@ -0,0 +1,30 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-embedded-opensource-4.0.0-b1/mkspecs/features/uic.prf~old-uic-compatibility.patch
++++ qt-embedded-opensource-4.0.0-b1/mkspecs/features/uic.prf
+@@ -13,8 +13,8 @@
+ isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR
+ isEmpty(UI_HEADERS_DIR):UI_HEADERS_DIR = $$UI_DIR
+ 
+-uic.commands = $$QMAKE_UIC -3 $$QMAKE_UIC3 ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+-uic.output = $$UI_HEADERS_DIR/ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
++uic.commands = $$QMAKE_UIC ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++uic.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+ uic.input = FORMS
+ uic.variable_out = HEADERS
+ uic.CONFIG += no_link
+@@ -24,9 +24,9 @@
+ INCLUDEPATH += $$UI_HEADERS_DIR
+ 
+ uic3 {
+-    uic3_decl.commands = $$QMAKE_UIC3 -decl ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++    uic3_decl.commands = $$QMAKE_UIC3 -decl ${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+     uic3_decl.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+-    uic3_decl.depends = $$QMAKE_UIC3 $$UI_HEADERS_DIR/ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
++    uic3_decl.depends = $$QMAKE_UIC3 $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+     uic3_decl.input = FORMS
+     uic3_decl.CONFIG += no_link
+     uic3_decl.variable_out = HEADERS