Merge with develop

--HG-- branch : compatibility-develop
2016-01-23 10:59:56 +01:00 · 2016-01-23 10:59:56 +01:00 · a8a1e04299
commit a8a1e04299
parent 5f70be0308 7f69309e39
1 changed files with 1 additions and 1 deletions
--- a/code/nel/tools/misc/crash_report/crash_report.cpp
+++ b/code/nel/tools/misc/crash_report/crash_report.cpp
@ -90,7 +90,7 @@ public:
 	Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
 #endif

-	Q_IMPORT_PLUGIN(QIcoPlugin)
+	Q_IMPORT_PLUGIN(QICOPlugin)

 #endif