From de250e3d0e437df09a8f23ad7fdb5fc39f17f7e8 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 3 Apr 2013 21:06:13 +0200
Subject: qtbase: drop qmake.conf.sh and qplatformdefs

* defaults in linux-g++ are correct, we need only to modify common
  linux.conf and g++-unix.conf
---
 recipes-qt/qt5/qtbase/qmake.conf.sh   | 41 -----------------------------------
 recipes-qt/qt5/qtbase/qplatformdefs.h |  1 -
 2 files changed, 42 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtbase/qmake.conf.sh
 delete mode 100644 recipes-qt/qt5/qtbase/qplatformdefs.h

(limited to 'recipes-qt/qt5/qtbase')

diff --git a/recipes-qt/qt5/qtbase/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh
deleted file mode 100644
index a3164d68..00000000
--- a/recipes-qt/qt5/qtbase/qmake.conf.sh
+++ /dev/null
@@ -1,41 +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_INCDIR_QT       = ${OE_QMAKE_INCDIR_QT}
-QMAKE_LIBDIR_QT       = ${OE_QMAKE_LIBDIR_QT}
-QMAKE_LIBS_X11        = ${OE_QMAKE_LIBS_X11}
-QMAKE_LIBS_X11SM      = ${OE_QMAKE_LIBS_X11SM}
-QMAKE_MOC             = ${OE_QMAKE_MOC}
-QMAKE_UIC             = ${OE_QMAKE_UIC}
-QMAKE_RCC             = ${OE_QMAKE_RCC}
-#QMAKE_AR              = ${OE_QMAKE_AR} cqs
-QMAKE_AR              = ${OE_QMAKE_AR}
-QMAKE_STRIP           = ${OE_QMAKE_STRIP}
-QMAKE_CFLAGS         += ${OE_QMAKE_CFLAGS}
-QMAKE_CXXFLAGS       += \$\$QMAKE_CFLAGS ${OE_QMAKE_CXXFLAGS}
-QMAKE_LFLAGS         += ${OE_QMAKE_LDFLAGS}
-QMAKE_CC              = ${OE_QMAKE_CC}
-QMAKE_LINK_C          = ${OE_QMAKE_LINK}
-QMAKE_LINK_C_SHLIB    = ${OE_QMAKE_LINK}
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += ${OE_QMAKE_CFLAGS}
-QMAKE_CXX             = ${OE_QMAKE_CXX}
-QMAKE_LINK            = ${OE_QMAKE_LINK}
-QMAKE_LINK_SHLIB      = ${OE_QMAKE_LINK}
-QMAKE_CONF_COMPILER   = ${OE_QMAKE_CONF_COMPILER}
-QMAKE_QT_CONFIG       = ${OE_QMAKE_QT_CONFIG}
-
-load(qt_config)
-EOF
diff --git a/recipes-qt/qt5/qtbase/qplatformdefs.h b/recipes-qt/qt5/qtbase/qplatformdefs.h
deleted file mode 100644
index 5d22fb41..00000000
--- a/recipes-qt/qt5/qtbase/qplatformdefs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../linux-g++/qplatformdefs.h"
-- 
cgit v1.2.3-54-g00ecf