[-]
[+]
|
Changed |
_service:tar_git:qtmozembed-qt5.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtmozembed-qt5.spec
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtmozembed-qt5-1.13.8.tar.bz2/src/qmozembed.pri
^
|
@@ -26,6 +26,7 @@
INCLUDEPATH += $$GECKO_INCLUDE_DIR $$GECKO_INCLUDE_DIR/nspr /usr/include/nspr4
LIBS += -L$$GECKO_LIB_DIR -lxpcomglue -Wl,--whole-archive -lmozglue -lmemory
LIBS += -Wl,--no-whole-archive -rdynamic -ldl
+PKGCONFIG += nspr
DEFINES += BUILD_GRE_HOME=\"\\\"$$BIN_DIR\\\"\"
|
[-]
[+]
|
Changed |
_service:tar_git:qtmozembed-qt5-1.13.8.tar.bz2/src/qopenglwebpage.cpp
^
|
@@ -216,6 +216,7 @@
if (mThrottlePainting != throttle) {
mThrottlePainting = throttle;
d->SetThrottlePainting(throttle);
+ Q_EMIT throttlePaintingChanged();
}
}
@@ -600,6 +601,14 @@
return;
}
setActive(true);
+
+ // Setting view as active, will reset RefreshDriver()->SetThrottled at
+ // PresShell::SetIsActive (nsPresShell). Thus, keep on throttling
+ // if should keep on throttling.
+ if (mThrottlePainting) {
+ d->SetThrottlePainting(true);
+ }
+
d->mView->ResumeTimeouts();
}
|
[-]
[+]
|
Changed |
_service:tar_git:qtmozembed-qt5-1.13.8.tar.bz2/tests/auto/mer-qt4/downloadmgr/tst_downloadmgr.qml
^
|
@@ -25,7 +25,7 @@
}
onRecvObserve: {
if (message == "embed:download") {
- // print("onRecvObserve: msg:" + message + ", dmsg:" + data.msg);
+ print("onRecvObserve: msg:" + message + ", dmsg:" + data.msg);
if (data.msg == "dl-done") {
appWindow.promptReceived = true;
}
|
[-]
[+]
|
Changed |
_service:tar_git:qtmozembed-qt5-1.13.8.tar.bz2/tests/test-definition-qt5/tests.xml
^
|
@@ -5,10 +5,10 @@
<set name="unit-tests" feature="QtMozEmbed">
<description>QML component unit tests</description>
<pre_steps>
- <step>/usr/sbin/mcetool --set-demo-mode=on</step>
+ <step>/usr/bin/start-ui-test.sh</step>
</pre_steps>
<post_steps>
- <step>/usr/sbin/mcetool --set-demo-mode=off</step>
+ <step>/usr/bin/stop-ui-test.sh</step>
</post_steps>
<case manual="false" timeout="200" name="unittests-context">
<step>cd /opt/tests/qtmozembed/auto/desktop-qt5/context &&DISPLAY=:0 QTVER=5 ../../run-tests.sh</step>
|