diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase')
4 files changed, 40 insertions, 62 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch deleted file mode 100644 index 3f2e3fd9..00000000 --- a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
3 | Date: Tue, 27 Nov 2012 12:46:44 -0800 | ||
4 | Subject: [PATCH] Always build uic | ||
5 | |||
6 | Even if we are not building gui or widgets. This tool is needed later | ||
7 | as a native tool when compiling the target. | ||
8 | |||
9 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
10 | --- | ||
11 | src/tools/tools.pro | 4 ++-- | ||
12 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/src/tools/tools.pro b/src/tools/tools.pro | ||
15 | index c67d6bf..b6f3b39 100644 | ||
16 | --- a/src/tools/tools.pro | ||
17 | +++ b/src/tools/tools.pro | ||
18 | @@ -1,8 +1,8 @@ | ||
19 | TEMPLATE = subdirs | ||
20 | |||
21 | -TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc | ||
22 | +TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic | ||
23 | contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml | ||
24 | -!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic | ||
25 | + | ||
26 | # Set subdir and respective target name | ||
27 | src_tools_bootstrap.subdir = $$PWD/bootstrap | ||
28 | src_tools_bootstrap.target = sub-tools-bootstrap | ||
29 | -- | ||
30 | 1.7.4.1 | ||
31 | |||
diff --git a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch deleted file mode 100644 index 6c9affae..00000000 --- a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 40e6c0f88774b55111c63ed28bba626141797476 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
3 | Date: Tue, 4 Dec 2012 15:32:33 -0800 | ||
4 | Subject: [PATCH 3/3] qtbase: Allow qt.conf override when bootstrapping | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
9 | --- | ||
10 | qmake/option.cpp | 5 +++++ | ||
11 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
12 | |||
13 | diff --git a/qmake/option.cpp b/qmake/option.cpp | ||
14 | index 91c154a..a4f3a85 100644 | ||
15 | --- a/qmake/option.cpp | ||
16 | +++ b/qmake/option.cpp | ||
17 | @@ -647,6 +647,11 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) | ||
18 | |||
19 | QString qt_libraryInfoFile() | ||
20 | { | ||
21 | + QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); | ||
22 | + if (QFile::exists(qtconfig)) { | ||
23 | + printf("Overriding with qt.conf from: %s\n", qtconfig.toLatin1().data()); | ||
24 | + return qtconfig; | ||
25 | + } | ||
26 | if (!Option::globals->qmake_abslocation.isEmpty()) | ||
27 | return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf"); | ||
28 | return QString(); | ||
29 | -- | ||
30 | 1.7.4.1 | ||
31 | |||
diff --git a/recipes-qt/qt5/qtbase/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh new file mode 100644 index 00000000..52682396 --- /dev/null +++ b/recipes-qt/qt5/qtbase/qmake.conf.sh | |||
@@ -0,0 +1,39 @@ | |||
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_INCDIR_QT = ${OE_QMAKE_INCDIR_QT} | ||
18 | QMAKE_LIBDIR_QT = ${OE_QMAKE_LIBDIR_QT} | ||
19 | QMAKE_LIBS_X11 = ${OE_QMAKE_LIBS_X11} | ||
20 | QMAKE_LIBS_X11SM = ${OE_QMAKE_LIBS_X11SM} | ||
21 | QMAKE_MOC = ${OE_QMAKE_MOC} | ||
22 | QMAKE_UIC = ${OE_QMAKE_UIC} | ||
23 | QMAKE_RCC = ${OE_QMAKE_RCC} | ||
24 | #QMAKE_AR = ${OE_QMAKE_AR} cqs | ||
25 | QMAKE_AR = ${OE_QMAKE_AR} | ||
26 | QMAKE_STRIP = ${OE_QMAKE_STRIP} | ||
27 | QMAKE_CFLAGS += ${OE_QMAKE_CFLAGS} | ||
28 | QMAKE_CXXFLAGS += \$\$QMAKE_CFLAGS ${OE_QMAKE_CXXFLAGS} | ||
29 | QMAKE_LFLAGS += ${OE_QMAKE_LDFLAGS} | ||
30 | QMAKE_CC = ${OE_QMAKE_CC} | ||
31 | QMAKE_LINK_C = ${OE_QMAKE_LINK} | ||
32 | QMAKE_LINK_C_SHLIB = ${OE_QMAKE_LINK} | ||
33 | QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += ${OE_QMAKE_CFLAGS} | ||
34 | QMAKE_CXX = ${OE_QMAKE_CXX} | ||
35 | QMAKE_LINK = ${OE_QMAKE_LINK} | ||
36 | QMAKE_LINK_SHLIB = ${OE_QMAKE_LINK} | ||
37 | |||
38 | load(qt_config) | ||
39 | EOF \ No newline at end of file | ||
diff --git a/recipes-qt/qt5/qtbase/qplatformdefs.h b/recipes-qt/qt5/qtbase/qplatformdefs.h new file mode 100644 index 00000000..5d22fb41 --- /dev/null +++ b/recipes-qt/qt5/qtbase/qplatformdefs.h | |||
@@ -0,0 +1 @@ | |||
#include "../linux-g++/qplatformdefs.h" | |||