diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-27 16:40:13 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-01-01 20:32:20 +0100 |
commit | 319a61802d4d5fb971693f3df1e69450e7bbab8a (patch) | |
tree | 4da00851ff5fe2e1c1a8bc5611ea52845046bdd8 | |
parent | 597f9bf624f81dd63358158fe656b8d7984cab07 (diff) | |
download | meta-qt5-319a61802d4d5fb971693f3df1e69450e7bbab8a.tar.gz |
qt5: remove unused qmake-build.conf.sh
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/files/qmake-build.conf.sh | 31 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase.inc | 1 |
2 files changed, 0 insertions, 32 deletions
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 @@ | |||
1 | #cat <<EOF | ||
2 | # | ||
3 | # qmake configuration for building with openembedded | ||
4 | # | ||
5 | |||
6 | MAKEFILE_GENERATOR = UNIX | ||
7 | TARGET_PLATFORM = unix | ||
8 | TEMPLATE = app | ||
9 | CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index | ||
10 | QT += core gui | ||
11 | QMAKE_INCREMENTAL_STYLE = sublib | ||
12 | |||
13 | include(../common/linux.conf) | ||
14 | include(../common/gcc-base-unix.conf) | ||
15 | include(../common/g++-unix.conf) | ||
16 | |||
17 | QMAKE_AR = ${OE_QMAKE_AR} cqs | ||
18 | #QMAKE_AR = ${BUILD_AR} cqs | ||
19 | QMAKE_STRIP = ${BUILD_STRIP} | ||
20 | QMAKE_CFLAGS += ${BUILD_CFLAGS} | ||
21 | QMAKE_CXXFLAGS += \$\$QMAKE_CFLAGS ${BUILD_CXXFLAGS} | ||
22 | #QMAKE_LFLAGS += ${BUILD_LDFLAGS} | ||
23 | QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) | ||
24 | QMAKE_CC = ${BUILD_CC} | ||
25 | QMAKE_LINK_C = ${BUILD_CCLD} | ||
26 | QMAKE_LINK_C_SHLIB = ${BUILD_CCLD} | ||
27 | QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += ${OE_QMAKE_CFLAGS} | ||
28 | QMAKE_CXX = ${BUILD_CXX} | ||
29 | QMAKE_LINK = ${BUILD_CXX} ${BUILD_LDFLAGS} | ||
30 | QMAKE_LINK_SHLIB = ${BUILD_CXX} ${BUILD_LDFLAGS} | ||
31 | 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 += " \ | |||
4 | file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ | 4 | file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ |
5 | file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ | 5 | file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ |
6 | file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ | 6 | file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ |
7 | file://qmake-build.conf.sh \ | ||
8 | file://qmake.conf.sh \ | 7 | file://qmake.conf.sh \ |
9 | file://qplatformdefs.h \ | 8 | file://qplatformdefs.h \ |
10 | " | 9 | " |