Merge with develop

This commit is contained in:
kervala 2016-01-23 10:59:56 +01:00
parent f8ceec9e3d
commit 40719ddda8

View file

@ -90,7 +90,7 @@ public:
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
#endif
Q_IMPORT_PLUGIN(QIcoPlugin)
Q_IMPORT_PLUGIN(QICOPlugin)
#endif