mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-12 20:51:17 +00:00
Merge remote-tracking branch 'origin/release/19.12'
This commit is contained in:
commit
88e5775f34
|
@ -1702,6 +1702,10 @@ void PartTest::testAdditionalActionTriggers()
|
|||
part.widget()->show();
|
||||
QVERIFY( QTest::qWaitForWindowExposed( part.widget() ) );
|
||||
|
||||
QTimer *delayResizeEventTimer = part.m_pageView->findChildren<QTimer *>("delayResizeEventTimer").at(0);
|
||||
QVERIFY(delayResizeEventTimer->isActive());
|
||||
QTest::qWait(delayResizeEventTimer->interval() * 2);
|
||||
|
||||
part.m_document->setViewportPage( 0 );
|
||||
|
||||
// wait for pixmap
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -82,6 +82,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -80,6 +80,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -102,6 +102,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -77,6 +77,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -102,6 +102,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -77,6 +77,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -82,6 +82,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -86,6 +86,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -78,6 +78,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -241,6 +241,7 @@
|
|||
<binary>okularkirigami</binary>
|
||||
</provides>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -291,6 +291,7 @@
|
|||
<value key="KDE::windows_store">https://www.microsoft.com/store/apps/9n41msq1wnm8</value>
|
||||
</custom>
|
||||
<releases>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
</releases>
|
||||
</component>
|
||||
|
|
|
@ -421,6 +421,7 @@ PageView::PageView( QWidget *parent, Okular::Document *document )
|
|||
|
||||
d->delayResizeEventTimer = new QTimer( this );
|
||||
d->delayResizeEventTimer->setSingleShot( true );
|
||||
d->delayResizeEventTimer->setObjectName("delayResizeEventTimer");
|
||||
connect( d->delayResizeEventTimer, &QTimer::timeout, this, &PageView::delayedResizeEvent );
|
||||
|
||||
setFrameStyle(QFrame::NoFrame);
|
||||
|
|
Loading…
Reference in a new issue