diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-07 10:06:40 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-30 09:03:09 +0000 |
| commit | 9195d9dc805fd3132023ff33bc77ace1f3f7e40f (patch) | |
| tree | deb85ffd58ce712d2ff0b5b5d49ec496232dfcc9 /classes | |
| parent | d7ebb6ce9b49eb52c325e73d92157d874e9cf907 (diff) | |
qt5: update to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
the contents of an environment value when qmake is run instead of when
Makefile is processed. All OE_QMAKE_xxx variables need to be exported
for qmake to find them. configure's setBootstrapVariable function needs
to change $$(..) to normal $(...) operator to work with qmake's Makefile.
qt.conf generation for qtbase recipes is not needed, as configure will
generate its own version based on configure arguments. Skip running
qmake, since configure is now automatically invoked when it's run in
qtbase's root folder.
Change-Id: I4c937c1acb3d204ac4560090cab3d0fc7e0e815a
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index f273567d..fa1bc563 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -31,18 +31,18 @@ EXTRA_OEMAKE = " \ " OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" -OE_QMAKE_COMPILER = "${CC}" -OE_QMAKE_CC = "${CC}" -OE_QMAKE_CFLAGS = "${CFLAGS}" -OE_QMAKE_CXX = "${CXX}" -OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -OE_QMAKE_LINK = "${CXX}" -OE_QMAKE_LDFLAGS = "${LDFLAGS}" -OE_QMAKE_AR = "${AR}" -OE_QMAKE_STRIP = "echo" -OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" +export OE_QMAKE_COMPILER = "${CC}" +export OE_QMAKE_CC = "${CC}" +export OE_QMAKE_CFLAGS = "${CFLAGS}" +export OE_QMAKE_CXX = "${CXX}" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +export OE_QMAKE_LINK = "${CXX}" +export OE_QMAKE_LDFLAGS = "${LDFLAGS}" +export OE_QMAKE_AR = "${AR}" +export OE_QMAKE_STRIP = "echo" +export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" -OE_QMAKE_QTCONF = "-qtconf ${OE_QMAKE_QTCONF_PATH}" +export OE_QMAKE_QTCONF = "-qtconf ${OE_QMAKE_QTCONF_PATH}" inherit qmake5_paths remove-libtool |