Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0

2009-02-19 16:30:59 +01:00
parent 469639fb3c 9c3ff6d31c
commit c5acf84724
2 changed files with 0 additions and 1 deletions
--- a/src/app/qtcreator.icns
+++ b/src/app/qtcreator.icns
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -39,7 +39,6 @@
 #include "iplugin.h"

 #include <QtCore/QMetaProperty>
-#include <QtCore/QPluginLoader>
 #include <QtCore/QDir>
 #include <QtCore/QTextStream>
 #include <QtCore/QWriteLocker>