diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-14 13:28:53 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-14 13:28:53 +0000 |
commit | 72472b8b06b9aa54e7f6cf3171b6c95606b23a16 (patch) | |
tree | 07f687a7c393884694485c4b26c5599ba4a2c7c7 /src | |
parent | ad17dd16e8c0be602c8751cdc8ada0903f642ee0 (diff) | |
parent | 3ec6544f65203743b0896fd1eca30931d3109cb3 (diff) |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src')
-rw-r--r-- | src/core/config/desktop_linux.pri | 1 | ||||
-rw-r--r-- | src/core/config/embedded_linux.pri | 2 | ||||
-rw-r--r-- | src/process/process.pro | 2 | ||||
-rw-r--r-- | src/webengine/ui_delegates_manager.cpp | 21 |
4 files changed, 15 insertions, 11 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 5a904fb83..500e04448 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -16,3 +16,4 @@ GYP_CONFIG += \ host_clang=0 \ clang=0 \ +!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 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 \ diff --git a/src/process/process.pro b/src/process/process.pro index 443c5c3d9..1d57a6c40 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -1,6 +1,6 @@ TARGET = $$QTWEBENGINEPROCESS_NAME TEMPLATE = app - +!build_pass:contains(QT_CONFIG, debug_and_release):contains(QT_CONFIG, build_all): CONFIG += release # Needed to set LSUIElement=1 QMAKE_INFO_PLIST = Info_mac.plist diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index ed4d59bfd..a8abcfff5 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -310,15 +310,6 @@ void UIDelegatesManager::showDialog(QSharedPointer<JavaScriptDialogController> 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<JavaScriptDialogController> 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); |