Commit 146c6d85 authored by Albert Astals Cid's avatar Albert Astals Cid

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

parents 437acd5c 223092aa
......@@ -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 );
}
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment