diff options
| author | dt <qtc-committer@nokia.com> | 2009-02-19 16:30:59 +0100 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2009-02-19 16:30:59 +0100 |
| commit | c5acf84724f9d90e0560aa6d0e4919e6fbbd081e (patch) | |
| tree | 97e39062a68abfd38868781a6aaca54d06c1d74b | |
| parent | 469639fb3c532c54ef03852b08f162ffd227c994 (diff) | |
| parent | 9c3ff6d31c2b906bb910fe71f645d6748315ec2c (diff) | |
| download | qt-creator-c5acf84724f9d90e0560aa6d0e4919e6fbbd081e.tar.gz | |
Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0
| -rw-r--r-- | src/app/qtcreator.icns | bin | 35774 -> 42937 bytes | |||
| -rw-r--r-- | src/libs/extensionsystem/pluginmanager.cpp | 1 |
2 files changed, 0 insertions, 1 deletions
diff --git a/src/app/qtcreator.icns b/src/app/qtcreator.icns Binary files differindex 9d309e683e..25241e2264 100644 --- a/src/app/qtcreator.icns +++ b/src/app/qtcreator.icns diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 5a1c8a00e6..2900f0437d 100644 --- 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> |