Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

src/plugins/help/centralwidget.cpp

@@ -435,7 +435,7 @@ void CentralWidget::setSourceInNewTab(const QUrl &url, int zoom)
     viewer->setZoom(zoom);
     viewer->setSource(url);
     viewer->setFocus(Qt::OtherFocusReason);
-    
+
 #if defined(QT_NO_WEBKIT)
     QFont font = viewer->font();
     font.setPointSize(font.pointSize() + int(zoom));
@@ -560,7 +560,7 @@ void CentralWidget::showTabBarContextMenu(const QPoint &point)
     closePages->setEnabled(enableAction);
 
     menu.addSeparator();
-    
+
     QAction *newBookmark = menu.addAction(tr("Add Bookmark for this Page..."));
     const QString &url = viewer->source().toString();
     if (url.isEmpty() || url == QLatin1String("about:blank"))

src/plugins/help/generalsettingspage.cpp

@@ -103,7 +103,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
 
     QString homePage = m_helpEngine->customValue(QLatin1String("HomePage"),
         QString()).toString();
-    
+
     if (homePage.isEmpty()) {
         homePage = m_helpEngine->customValue(QLatin1String("DefaultHomePage"),
             QLatin1String("about:blank")).toString();
@@ -116,7 +116,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
     index = m_helpEngine->customValue(QLatin1String("ContextHelpOption"), 0).toInt();
     m_ui.contextHelpComboBox->setCurrentIndex(index);
 
-    
+
     connect(m_ui.currentPageButton, SIGNAL(clicked()), this, SLOT(setCurrentPage()));
     connect(m_ui.blankPageButton, SIGNAL(clicked()), this, SLOT(setBlankPage()));
     connect(m_ui.defaultPageButton, SIGNAL(clicked()), this, SLOT(setDefaultPage()));

src/plugins/help/openedviewerswidget.h

@@ -40,7 +40,7 @@ namespace Help {
     namespace Internal {
 
 class OpenedViewersDelegate : public QStyledItemDelegate
-{   
+{
     Q_OBJECT
 public:
     OpenedViewersDelegate(QObject *parent = 0);