From 66992ebdf7d80c6fee817f786a8e0f13b80cd048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Thu, 8 Jan 2015 14:28:48 +0100 Subject: Respect the pulseaudio configuration from Qt. It was previously ignored for Desktop Linux. Change-Id: I214171d222a5e7e0ee64afde225a742adbda4adf Task-number: QTBUG-43387 Reviewed-by: Andras Becsi --- src/core/config/desktop_linux.pri | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 7f28cb36b..57fb39f6e 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -14,3 +14,4 @@ GYP_CONFIG += \ use_kerberos=0 \ use_pango=0 \ +!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 -- cgit v1.2.3 From 79773ecfcc27b350a3e5ea1149ef51f7cc657b61 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 9 Jan 2015 14:08:21 +0100 Subject: Fixed build when doing arm cross compilation without --sysroot Otherwise gyp will use it's own sysroot (which doesn't exists) if you are doing a croos-build without using the --sysroot configure option Updates the src/3rdparty SHA1. Change-Id: I450eaf95c50b3cf5dd2ad553bd363481def511fd Reviewed-by: Jocelyn Turcotte --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index be4ec3fa6..caa6297dd 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit be4ec3fa64a4c6c2b641830a9811ab7847c7dd39 +Subproject commit caa6297dd5254b01276e6ff6aa19001ba3737ccc -- cgit v1.2.3 From f65aea4d98f498a1e97abf84bad24789f2342499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Tue, 20 Jan 2015 11:18:20 +0100 Subject: Also run the rejected signal handler when closing prompt dialogs. The prompt dialog inherits ApplicationWindow, which emits the signal "closing" when the window gets closed by pressing the X button. Change-Id: I23e5cf6f8e81251869d765d7fd2864257f3c0b89 Task-number: QTBUG-43902 Reviewed-by: Andras Becsi --- src/webengine/ui_delegates_manager.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index 48e1bee7e..9e7af3fad 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -310,15 +310,6 @@ void UIDelegatesManager::showDialog(QSharedPointer d QQmlProperty titleProp(dialog, QStringLiteral("title")); titleProp.write(title); - if (dialogComponentType == PromptDialog) { - QQmlProperty promptProp(dialog, QStringLiteral("prompt")); - promptProp.write(dialogController->defaultPrompt()); - QQmlProperty inputSignal(dialog, QStringLiteral("onInput")); - CHECK_QML_SIGNAL_PROPERTY(inputSignal, dialogComponent->url()); - static int setTextIndex = dialogController->metaObject()->indexOfSlot("textProvided(QString)"); - QObject::connect(dialog, inputSignal.method(), dialogController.data(), dialogController->metaObject()->method(setTextIndex)); - } - QQmlProperty acceptSignal(dialog, QStringLiteral("onAccepted")); QQmlProperty rejectSignal(dialog, QStringLiteral("onRejected")); CHECK_QML_SIGNAL_PROPERTY(acceptSignal, dialogComponent->url()); @@ -328,6 +319,18 @@ void UIDelegatesManager::showDialog(QSharedPointer d QObject::connect(dialog, acceptSignal.method(), dialogController.data(), dialogController->metaObject()->method(acceptIndex)); static int rejectIndex = dialogController->metaObject()->indexOfSlot("reject()"); QObject::connect(dialog, rejectSignal.method(), dialogController.data(), dialogController->metaObject()->method(rejectIndex)); + + if (dialogComponentType == PromptDialog) { + QQmlProperty promptProp(dialog, QStringLiteral("prompt")); + promptProp.write(dialogController->defaultPrompt()); + QQmlProperty inputSignal(dialog, QStringLiteral("onInput")); + CHECK_QML_SIGNAL_PROPERTY(inputSignal, dialogComponent->url()); + static int setTextIndex = dialogController->metaObject()->indexOfSlot("textProvided(QString)"); + QObject::connect(dialog, inputSignal.method(), dialogController.data(), dialogController->metaObject()->method(setTextIndex)); + QQmlProperty closingSignal(dialog, QStringLiteral("onClosing")); + QObject::connect(dialog, closingSignal.method(), dialogController.data(), dialogController->metaObject()->method(rejectIndex)); + } + dialogComponent->completeCreate(); QObject::connect(dialogController.data(), &JavaScriptDialogController::dialogCloseRequested, dialog, &QObject::deleteLater); -- cgit v1.2.3 From 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Fri, 30 Jan 2015 13:10:15 +0100 Subject: eLinux: build ffmpegsumo as well. This will only contain free codecs. Change-Id: I021b2c121bf146abb24b7a90dd1c3580638b1058 Reviewed-by: Andras Becsi --- src/core/config/embedded_linux.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 4000625c6..773bf0be1 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -1,7 +1,7 @@ GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi" GYP_CONFIG += \ - build_ffmpegsumo=0 \ + build_ffmpegsumo=1 \ configuration_policy=0 \ desktop_linux=0 \ disable_nacl=1 \ -- cgit v1.2.3