office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-28 19:28:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/Applications/15.04'

Browse source
This commit is contained in:
Albert Astals Cid 2015-05-14 00:59:48 +02:00
commit 146c6d85bb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/script/kjs_document.cpp
View file

@ -125,7 +125,7 @@ static KJSObject docGetExternal( KJSContext *, void *object )
const bool isShell = ( widget
&& widget->parentWidget()
&& widget->parentWidget()->objectName() == QLatin1String( "okular::Shell" ) );
&& widget->parentWidget()->objectName().startsWith( QLatin1String( "okular::Shell" ) ) );
return KJSBoolean( !isShell );
}

4
part.cpp
View file

@ -239,8 +239,8 @@ static Okular::EmbedMode detectEmbedMode( QWidget *parentWidget, QObject *parent
Q_UNUSED( parentWidget );
if ( parent
&& ( parent->objectName() == QLatin1String( "okular::Shell" )
|| parent->objectName() == QLatin1String( "okular/okular__Shell" ) ) )
&& ( parent->objectName().startsWith( QLatin1String( "okular::Shell" ) )
|| parent->objectName().startsWith( QLatin1String( "okular/okular__Shell" ) ) ) )
return Okular::NativeShellMode;
if ( parent