From b692e1f9dcae08dca2d6a14c69cd9d9cbc679335 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 18 May 2016 16:50:14 +0200 Subject: Remove fake dependencies in embedded linux builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When doing embedded Linux builds we do not use X11 libraries. Change-Id: I704d8fd4853e2187590bc9513f55b7ec61c9c4bd Reviewed-by: Michael Brüning --- tools/qmake/mkspecs/features/configure.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 811a88e89..9d7d85535 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -26,7 +26,7 @@ defineTest(runConfigure) { !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") REQUIRED_PACKAGES = dbus-1 fontconfig - contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst + !cross_compile: contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse contains(QT_CONFIG, system-png): REQUIRED_PACKAGES += libpng contains(QT_CONFIG, system-harfbuzz): REQUIRED_PACKAGES += harfbuzz -- cgit v1.2.3 From 42f670cecade8b0859a82b69fe80c456741591de Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 25 May 2016 12:13:06 +0200 Subject: Remove harmful spaces in qmake argument help Change-Id: I47182d78f9dc8ecb8b4758f3ab739eaf88c04e24 Reviewed-by: Allan Sandfeld Jensen --- tools/qmake/mkspecs/features/configure.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index af87a587e..8c58b8e3f 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -121,7 +121,7 @@ defineTest(finalizeConfigure) { use?(appstore_compliant_code) { log("AppStore Compliant ............... Enabled$${EOL}") } else { - log("AppStore Compliant ............... Not enabled (Default, enable with WEBENGINE_CONFIG += use_appstore_compliant_code)$${EOL}") + log("AppStore Compliant ............... Not enabled (Default, enable with WEBENGINE_CONFIG+=use_appstore_compliant_code)$${EOL}") } } } -- cgit v1.2.3 From 61cdc9daca3ca7f9d4f3c7e8fa3b49f89ce02887 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 25 May 2016 15:01:19 +0200 Subject: Preserve paths with spaces in MOC_COMMAND This fixes a problem caused by change efd2ea8ea720 in qtbase. MOC_COMMAND now can contain paths with unescaped spaces, like /us/include "/Library/Frameworks (framework directory)" Splitting this just by space will lead to a broken moc call. Change-Id: Ic2875917059141ec82cf5f66243a357ac7ee0ba3 Task-number: QTBUG-53612 Reviewed-by: Allan Sandfeld Jensen --- tools/qmake/mkspecs/features/gyp_generator.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index eea11ef09..0ba6de09c 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -17,7 +17,7 @@ defineReplace(mocAction) { MOC_COMMAND = $$clean_path($$mocCmdBase()) MOC_COMMAND = $$replace(MOC_COMMAND, $$re_escape("$(DEFINES)"), $$DEFINES_LIST) MOC_COMMAND = $$replace(MOC_COMMAND, $$re_escape("$(INCPATH)"), $$INCPATH) - MOC_COMMAND = $$split(MOC_COMMAND, " ") + MOC_COMMAND = $$eval($$list($$MOC_COMMAND)) OUTPUT_FILE = $$MOC_GEN_DIR/$${OUTPUT_NAME} contents = " {" \ " 'action_name':'$$OUTPUT_NAME'," \ -- cgit v1.2.3