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

shell/main.cpp

@@ -34,14 +34,11 @@ int main(int argc, char** argv)
     KLocalizedString::setApplicationDomain("okular");
 
     KAboutData aboutData = okularAboutData();
-
-    app.setApplicationName(aboutData.applicationData().componentName());
-    app.setApplicationDisplayName(aboutData.applicationData().displayName());
-    app.setApplicationVersion(aboutData.version());
-    app.setOrganizationDomain(QStringLiteral("kde.org"));
+    KAboutData::setApplicationData(aboutData);
+    // set icon for shells which do not use desktop file metadata
+    QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular")));
 
     QCommandLineParser parser;
-    KAboutData::setApplicationData(aboutData);
     // The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility
     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
     parser.addVersionOption();

ui/pageview.cpp

@@ -400,7 +400,9 @@ PageView::PageView( QWidget *parent, Okular::Document *document )
     viewport()->setMouseTracking( true );
     viewport()->setAutoFillBackground( false );
     // the apparently "magic" value of 20 is the same used internally in QScrollArea
+    verticalScrollBar()->setCursor( Qt::ArrowCursor );
     verticalScrollBar()->setSingleStep( 20 );
+    horizontalScrollBar()->setCursor( Qt::ArrowCursor );
     horizontalScrollBar()->setSingleStep( 20 );
 
     // conntect the padding of the viewport to pixmaps requests