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
This commit is contained in:
parent
85b0bb6445
commit
de250e3d0e
|
@ -5,8 +5,6 @@ SRC_URI += " \
|
||||||
file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
|
file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
|
||||||
file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
|
file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
|
||||||
file://0004-configure-eval-QMAKE_CXX.patch \
|
file://0004-configure-eval-QMAKE_CXX.patch \
|
||||||
file://qmake.conf.sh \
|
|
||||||
file://qplatformdefs.h \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}"
|
DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}"
|
||||||
|
@ -53,12 +51,6 @@ EOF
|
||||||
OE_XQMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++"
|
OE_XQMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++"
|
||||||
|
|
||||||
do_configure_append() {
|
do_configure_append() {
|
||||||
# qtbase is exception, create mkspecs for it
|
|
||||||
if [ ! -e ${OE_XQMAKESPEC} ]; then
|
|
||||||
mkdir -p ${OE_XQMAKESPEC}
|
|
||||||
bash ${WORKDIR}/qmake.conf.sh > ${OE_XQMAKESPEC}/qmake.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
./configure -v \
|
./configure -v \
|
||||||
-dont-process \
|
-dont-process \
|
||||||
-opensource -confirm-license \
|
-opensource -confirm-license \
|
||||||
|
|
|
@ -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
|
|
|
@ -1 +0,0 @@
|
||||||
#include "../linux-g++/qplatformdefs.h"
|
|
Loading…
Reference in New Issue