From 120455b11a0860b13d961a7d878c06efdafb9d8c Mon Sep 17 00:00:00 2001
From: "S. Razi Alavizadeh" <srazi61@yahoo.com>
Date: Fri, 22 Feb 2013 03:43:59 +0330
Subject: [PATCH] Used qIconProvider instead of  QFileIconProvider() and
 removed msgHandler on Windows.

---
 src/lib/network/schemehandlers/ftpschemehandler.cpp | 2 +-
 src/main/main.cpp                                   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/network/schemehandlers/ftpschemehandler.cpp b/src/lib/network/schemehandlers/ftpschemehandler.cpp
index bab7b7225..ec074ee5c 100644
--- a/src/lib/network/schemehandlers/ftpschemehandler.cpp
+++ b/src/lib/network/schemehandlers/ftpschemehandler.cpp
@@ -312,7 +312,7 @@ QString FtpSchemeReply::loadDirectory()
             itemIcon = QzTools::iconFromFileName(itemPath);
         }
         else {
-            itemIcon = QFileIconProvider().icon(QFileIconProvider::Folder);
+            itemIcon = qIconProvider->standardIcon(QStyle::SP_DirIcon);
         }
 
         line += QLatin1String("><td class=\"td-name\" style=\"background-image:url(data:image/png;base64,");
diff --git a/src/main/main.cpp b/src/main/main.cpp
index c6f81788d..7ec623954 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -161,11 +161,13 @@ int main(int argc, char* argv[])
 {
     QT_REQUIRE_VERSION(argc, argv, "4.7.0");
 
+#ifndef Q_OS_WIN
 #if (QT_VERSION < 0x050000)
     qInstallMsgHandler(&msgHandler);
 #else
     qInstallMessageHandler(&msgHandler);
 #endif
+#endif
 
 #if defined(QZ_WS_X11) && QT_VERSION < 0x050000
     QApplication::setGraphicsSystem("raster"); // Better overall performance on X11