From 319a61802d4d5fb971693f3df1e69450e7bbab8a Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 27 Dec 2012 16:40:13 +0100
Subject: qt5: remove unused qmake-build.conf.sh

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/files/qmake-build.conf.sh | 31 -------------------------------
 recipes-qt/qt5/qtbase.inc                |  1 -
 2 files changed, 32 deletions(-)
 delete mode 100644 recipes-qt/qt5/files/qmake-build.conf.sh

(limited to 'recipes-qt/qt5')

diff --git a/recipes-qt/qt5/files/qmake-build.conf.sh b/recipes-qt/qt5/files/qmake-build.conf.sh
deleted file mode 100644
index f09433a1..00000000
--- a/recipes-qt/qt5/files/qmake-build.conf.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#cat <<EOF
-#
-# qmake configuration for building with openembedded
-#
-
-MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
-TEMPLATE                = app
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
-QT                      += core gui
-QMAKE_INCREMENTAL_STYLE = sublib
-
-include(../common/linux.conf)
-include(../common/gcc-base-unix.conf)
-include(../common/g++-unix.conf)
-
-QMAKE_AR              = ${OE_QMAKE_AR} cqs
-#QMAKE_AR              = ${BUILD_AR} cqs
-QMAKE_STRIP           = ${BUILD_STRIP}
-QMAKE_CFLAGS         += ${BUILD_CFLAGS}
-QMAKE_CXXFLAGS       += \$\$QMAKE_CFLAGS ${BUILD_CXXFLAGS}
-#QMAKE_LFLAGS         += ${BUILD_LDFLAGS}
-QMAKE_LFLAGS		 += $(OE_QMAKE_LDFLAGS)
-QMAKE_CC              = ${BUILD_CC}
-QMAKE_LINK_C          = ${BUILD_CCLD}
-QMAKE_LINK_C_SHLIB    = ${BUILD_CCLD}
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += ${OE_QMAKE_CFLAGS}
-QMAKE_CXX             = ${BUILD_CXX}
-QMAKE_LINK            = ${BUILD_CXX} ${BUILD_LDFLAGS}
-QMAKE_LINK_SHLIB      = ${BUILD_CXX} ${BUILD_LDFLAGS}
-QMAKE_RANLIB = ${BUILD_RANLIB}
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 4b397917..2b14de1e 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -4,7 +4,6 @@ SRC_URI += " \
   file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \
   file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
   file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
-  file://qmake-build.conf.sh \
   file://qmake.conf.sh \
   file://qplatformdefs.h \
 "
-- 
cgit v1.2.3-54-g00ecf