3 files changed, 19 insertions, 0 deletions
diff --git a/tools/assistant/tools/assistant/installdialog.cpp b/tools/assistant/tools/assistant/installdialog.cpp
index 5a8dfeaf8..2574f1f8b 100644
--- a/tools/assistant/tools/assistant/installdialog.cpp
+++ b/tools/assistant/tools/assistant/installdialog.cpp
@@ -56,6 +56,7 @@
 #include <QtNetwork/QHttp>
 
 QT_BEGIN_NAMESPACE
+#ifndef QT_NO_HTTP
 
 #define QCH_FILENAME  92943
 #define QCH_NAMESPACE 92944
@@ -335,4 +336,5 @@ void InstallDialog::browseDirectories()
         m_ui.pathLineEdit->setText(dir);
 }
 
+#endif
 QT_END_NAMESPACE
diff --git a/tools/assistant/tools/assistant/installdialog.h b/tools/assistant/tools/assistant/installdialog.h
index 62759ecd7..9e18a22b9 100644
--- a/tools/assistant/tools/assistant/installdialog.h
+++ b/tools/assistant/tools/assistant/installdialog.h
@@ -47,6 +47,8 @@
 #include <QtNetwork/QHttpResponseHeader>
 #include "ui_installdialog.h"
 
+#ifndef QT_NO_HTTP
+
 QT_BEGIN_NAMESPACE
 
 class QHttp;
@@ -98,4 +100,6 @@ private:
 
 QT_END_NAMESPACE
 
+#endif
+
 #endif // INSTALLDIALOG_H
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index bc73b80d6..a0d4fbfcc 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -545,6 +545,19 @@ void MainWindow::setupActions()
     m_aboutAction = menu->addAction(tr("About..."), this, SLOT(showAboutDialog()));
     m_aboutAction->setMenuRole(QAction::AboutRole);
 
+#ifdef Q_WS_X11
+    m_backAction->setIcon(QIcon::fromTheme("go-previous" , m_backAction->icon()));
+    m_nextAction->setIcon(QIcon::fromTheme("go-next" , m_nextAction->icon()));
+    m_zoomInAction->setIcon(QIcon::fromTheme("zoom-in" , m_zoomInAction->icon()));
+    m_zoomOutAction->setIcon(QIcon::fromTheme("zoom-out" , m_zoomOutAction->icon()));
+    m_resetZoomAction->setIcon(QIcon::fromTheme("zoom-original" , m_resetZoomAction->icon()));
+    m_syncAction->setIcon(QIcon::fromTheme("view-refresh" , m_syncAction->icon()));
+    m_copyAction->setIcon(QIcon::fromTheme("edit-copy" , m_copyAction->icon()));
+    m_findAction->setIcon(QIcon::fromTheme("edit-find" , m_findAction->icon()));
+    m_homeAction->setIcon(QIcon::fromTheme("go-home" , m_homeAction->icon()));
+    m_printAction->setIcon(QIcon::fromTheme("document-print" , m_printAction->icon()));
+#endif
+
     QToolBar *navigationBar = addToolBar(tr("Navigation Toolbar"));
     navigationBar->setObjectName(QLatin1String("NavigationToolBar"));
     navigationBar->addAction(m_backAction);