Cleanup work to match Qt habits.

Change-Id: I6f177c05ac464e13096ed9d517736e0b06773f66
Reviewed-on: http://codereview.qt.nokia.com/4340
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>

30 files changed, 302 insertions, 246 deletions

diff --git a/simpletest/simpletest.pro b/simpletest/simpletest.pro
index 0cf9b75..ba6de14 100644
--- a/simpletest/simpletest.pro
+++ b/simpletest/simpletest.pro
@@ -13,7 +13,7 @@ QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi           -Wshadow -Wno-long-lo
 # dependency management
 QMAKE_CXXFLAGS += -MMD
 include_dependencies.target = include_dependencies
-include_dependencies.commands = @if grep \"^include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi
+include_dependencies.commands = @if grep \"^-include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"-include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi
 QMAKE_EXTRA_TARGETS += include_dependencies
 POST_TARGETDEPS += include_dependencies
 
@@ -30,10 +30,10 @@ SOURCES += tst_simple_mimetypes.cpp
 # No headers
 
 
-SOURCES += $$API_DIR/src/declarative/declarativemimetype.cpp \
-           $$API_DIR/src/declarative/declarativemimetyperegistry.cpp \
-           $$API_DIR/src/declarative/declarativeserviceaction.cpp
+SOURCES += $$API_DIR/src/imports/mimetypes/qdeclarativemimetype.cpp \
+           $$API_DIR/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp \
+           $$API_DIR/src/imports/mimetypes/qdeclarativeserviceaction.cpp
 
-HEADERS += $$API_DIR/src/declarative/declarativemimetype_p.h \
-           $$API_DIR/src/declarative/declarativemimetyperegistry_p.h \
-           $$API_DIR/src/declarative/declarativeserviceaction_p.h
+HEADERS += $$API_DIR/src/imports/mimetypes/qdeclarativemimetype_p.h \
+           $$API_DIR/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h \
+           $$API_DIR/src/imports/mimetypes/qdeclarativeserviceaction_p.h
diff --git a/simpletest/tst_simple_mimetypes.cpp b/simpletest/tst_simple_mimetypes.cpp
index 73e52bc..d21a106 100644
--- a/simpletest/tst_simple_mimetypes.cpp
+++ b/simpletest/tst_simple_mimetypes.cpp
@@ -1,4 +1,4 @@
-#include "mimetyperegistry.h"
+#include "qmimetyperegistry.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
deleted file mode 100644
index cb87d76..0000000
--- a/src/declarative/declarative.pro
+++ /dev/null
@@ -1,41 +0,0 @@
-CONFIG   += qt plugin
-TEMPLATE = lib
-TARGET   = declarative_mimetypes
-DESTDIR  = ../../imports/com/nokia/MimeTypes
-
-# QtCore/qlist.h uses /usr/include/limits.h which uses does not compile with -pedantic.
-# QtDeclarative/qdeclarativeprivate.h will not compile with -pedantic.
-#MAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -pedantic -Wshadow -Wno-long-long -Wnon-virtual-dtor -Wc++0x-compat
-QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi           -Wshadow -Wno-long-long -Wnon-virtual-dtor -Wc++0x-compat
-
-# dependency management
-QMAKE_CXXFLAGS += -MMD
-include_dependencies.target = include_dependencies
-include_dependencies.commands = @if grep \"^include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi
-QMAKE_EXTRA_TARGETS += include_dependencies
-POST_TARGETDEPS += include_dependencies
-
-
-API_DIR = ../..
-
-INCLUDEPATH += $$API_DIR/src/mimetypes
-
-
-SOURCES += $$API_DIR/src/declarative/declarative_mimetypes.cpp
-
-HEADERS += $$API_DIR/src/declarative/declarative_mimetypes.h
-
-
-SOURCES += $$API_DIR/src/declarative/declarativemimetype.cpp \
-           $$API_DIR/src/declarative/declarativemimetyperegistry.cpp \
-           $$API_DIR/src/declarative/declarativeserviceaction.cpp
-
-HEADERS += $$API_DIR/src/declarative/declarativemimetype_p.h \
-           $$API_DIR/src/declarative/declarativemimetyperegistry_p.h \
-           $$API_DIR/src/declarative/declarativeserviceaction_p.h
-
-
-qmldir.files += $$PWD/qmldir
-qmldir.path += ../../imports/com/nokia/MimeTypes
-
-INSTALLS += qmldir
diff --git a/src/declarative/declarative_mimetypes.cpp b/src/declarative/declarative_mimetypes.cpp
deleted file mode 100644
index 0f28a2f..0000000
--- a/src/declarative/declarative_mimetypes.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "declarative_mimetypes.h"
-
-#include "declarativemimetype_p.h"
-#include "declarativemimetyperegistry_p.h"
-#include "declarativeserviceaction_p.h"
-
-// ------------------------------------------------------------------------------------------------
-
-void QMimeTypeDeclarativeExtensionPlugin::registerTypes(const char* uri)
-{
-    qmlRegisterType<DeclarativeMimeType>(uri, 1, 0, "MimeType");
-    qmlRegisterType<DeclarativeMimeTypeRegistry>(uri, 1, 0, "MimeTypeRegistry");
-    qmlRegisterType<DeclarativeServiceAction>(uri, 1, 0, "ServiceAction");
-}
-
-// ------------------------------------------------------------------------------------------------
-
-Q_EXPORT_PLUGIN2(declarative_mimetypes, QT_PREPEND_NAMESPACE(QMimeTypeDeclarativeExtensionPlugin))
diff --git a/src/declarative/declarative_mimetypes.h b/src/declarative/declarative_mimetypes.h
deleted file mode 100644
index 232e2c3..0000000
--- a/src/declarative/declarative_mimetypes.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef DECLARATIVE_MIME_TYPES_H_INCLUDED
-#define DECLARATIVE_MIME_TYPES_H_INCLUDED
-
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-
-// ------------------------------------------------------------------------------------------------
-
-class QMimeTypeDeclarativeExtensionPlugin : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-
-public:
-    virtual void registerTypes(const char* uri);
-};
-
-#endif
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
new file mode 100644
index 0000000..8d627c0
--- /dev/null
+++ b/src/imports/imports.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += mimetypes
diff --git a/src/imports/mimetypes/mimetypes.cpp b/src/imports/mimetypes/mimetypes.cpp
new file mode 100644
index 0000000..13463ef
--- /dev/null
+++ b/src/imports/mimetypes/mimetypes.cpp
@@ -0,0 +1,30 @@
+#include "qdeclarativemimetype_p.h"
+#include "qdeclarativemimetyperegistry_p.h"
+#include "qdeclarativeserviceaction_p.h"
+
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+
+// ------------------------------------------------------------------------------------------------
+
+class QMimeTypesDeclarativeModule : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+
+public:
+    virtual void registerTypes(const char* uri);
+};
+
+// ------------------------------------------------------------------------------------------------
+
+void QMimeTypesDeclarativeModule::registerTypes(const char* uri)
+{
+    qmlRegisterType<QDeclarativeMimeType>(uri, 1, 0, "MimeType");
+    qmlRegisterType<QDeclarativeMimeTypeRegistry>(uri, 1, 0, "MimeTypeRegistry");
+    qmlRegisterType<QDeclarativeServiceAction>(uri, 1, 0, "ServiceAction");
+}
+
+// ------------------------------------------------------------------------------------------------
+
+#include "mimetypes.moc"
+
+Q_EXPORT_PLUGIN2(qmimetypesdeclarativemodule, QT_PREPEND_NAMESPACE(QMimeTypesDeclarativeModule))
diff --git a/src/imports/mimetypes/mimetypes.pro b/src/imports/mimetypes/mimetypes.pro
new file mode 100644
index 0000000..599611c
--- /dev/null
+++ b/src/imports/mimetypes/mimetypes.pro
@@ -0,0 +1,41 @@
+CONFIG   += qt plugin
+TEMPLATE = lib
+TARGET   = declarative_mimetypes
+DESTDIR  = ../../../imports/com/nokia/MimeTypes
+
+# QtCore/qlist.h uses /usr/include/limits.h which uses does not compile with -pedantic.
+# QtDeclarative/qdeclarativeprivate.h will not compile with -pedantic.
+#MAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -pedantic -Wshadow -Wno-long-long -Wnon-virtual-dtor -Wc++0x-compat
+QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi           -Wshadow -Wno-long-long -Wnon-virtual-dtor -Wc++0x-compat
+
+# dependency management
+QMAKE_CXXFLAGS += -MMD
+include_dependencies.target = include_dependencies
+include_dependencies.commands = @if grep \"^-include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"-include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi
+QMAKE_EXTRA_TARGETS += include_dependencies
+POST_TARGETDEPS += include_dependencies
+
+
+API_DIR = ../../..
+
+INCLUDEPATH += $$API_DIR/src/mimetypes
+
+
+SOURCES += $$API_DIR/src/imports/mimetypes/mimetypes.cpp
+
+# No headers
+
+
+SOURCES += $$API_DIR/src/imports/mimetypes/qdeclarativemimetype.cpp \
+           $$API_DIR/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp \
+           $$API_DIR/src/imports/mimetypes/qdeclarativeserviceaction.cpp
+
+HEADERS += $$API_DIR/src/imports/mimetypes/qdeclarativemimetype_p.h \
+           $$API_DIR/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h \
+           $$API_DIR/src/imports/mimetypes/qdeclarativeserviceaction_p.h
+
+
+qmldir.files += $$PWD/qmldir
+qmldir.path += ../../../imports/com/nokia/MimeTypes
+
+INSTALLS += qmldir
diff --git a/src/declarative/declarativemimetype.cpp b/src/imports/mimetypes/qdeclarativemimetype.cpp
index b8c668a..1e156dc 100644
--- a/src/declarative/declarativemimetype.cpp
+++ b/src/imports/mimetypes/qdeclarativemimetype.cpp
@@ -1,31 +1,31 @@
-#include "declarativemimetype_p.h"
+#include "qdeclarativemimetype_p.h"
 
 #include <QtCore/QDebug>
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeMimeType::DeclarativeMimeType(QObject *theParent) :
+QDeclarativeMimeType::QDeclarativeMimeType(QObject *theParent) :
         QObject(theParent),
         m_MimeType()
 {}
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeMimeType::DeclarativeMimeType(const QMimeType &other, QObject *theParent) :
+QDeclarativeMimeType::QDeclarativeMimeType(const QMimeType &other, QObject *theParent) :
         QObject(theParent),
         m_MimeType(other)
 {}
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeMimeType::~DeclarativeMimeType()
+QDeclarativeMimeType::~QDeclarativeMimeType()
 {
     //qDebug() << Q_FUNC_INFO << "name():" << name();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeType::assign(DeclarativeMimeType *other)
+void QDeclarativeMimeType::assign(QDeclarativeMimeType *other)
 {
     if (other == 0) {
         qWarning() << Q_FUNC_INFO << "other:" << other;
@@ -37,7 +37,7 @@ void DeclarativeMimeType::assign(DeclarativeMimeType *other)
 
 // ------------------------------------------------------------------------------------------------
 
-bool DeclarativeMimeType::equals(DeclarativeMimeType *other) const
+bool QDeclarativeMimeType::equals(QDeclarativeMimeType *other) const
 {
     if (other == 0) {
         qWarning() << Q_FUNC_INFO << "other:" << other;
@@ -49,63 +49,63 @@ bool DeclarativeMimeType::equals(DeclarativeMimeType *other) const
 
 // ------------------------------------------------------------------------------------------------
 
-QMimeType DeclarativeMimeType::mimeType() const
+QMimeType QDeclarativeMimeType::mimeType() const
 {
     return m_MimeType;
 }
 
 // ------------------------------------------------------------------------------------------------
 
-bool DeclarativeMimeType::isValid() const
+bool QDeclarativeMimeType::isValid() const
 {
     return m_MimeType.isValid();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-const QMimeTypeName &DeclarativeMimeType::name() const
+const QMimeTypeName &QDeclarativeMimeType::name() const
 {
     return m_MimeType.name();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeType::setName(const QMimeTypeName &newName)
+void QDeclarativeMimeType::setName(const QMimeTypeName &newName)
 {
     m_MimeType = QMimeType(newName, m_MimeType.displayName(), m_MimeType.iconUrl(), m_MimeType.fileExtentions());
 }
 
 // ------------------------------------------------------------------------------------------------
 
-const QString &DeclarativeMimeType::displayName() const
+const QString &QDeclarativeMimeType::displayName() const
 {
     return m_MimeType.displayName();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeType::setDisplayName(const QString &newDisplayName)
+void QDeclarativeMimeType::setDisplayName(const QString &newDisplayName)
 {
     m_MimeType = QMimeType(m_MimeType.name(), newDisplayName, m_MimeType.iconUrl(), m_MimeType.fileExtentions());
 }
 
 // ------------------------------------------------------------------------------------------------
 
-const QString &DeclarativeMimeType::iconUrl() const
+const QString &QDeclarativeMimeType::iconUrl() const
 {
     return m_MimeType.iconUrl();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeType::setIconUrl(const QString &newIconUrl)
+void QDeclarativeMimeType::setIconUrl(const QString &newIconUrl)
 {
     m_MimeType = QMimeType(m_MimeType.name(), m_MimeType.displayName(), newIconUrl, m_MimeType.fileExtentions());
 }
 
 // ------------------------------------------------------------------------------------------------
 
-QVariantList DeclarativeMimeType::fileExtentions() const
+QVariantList QDeclarativeMimeType::fileExtentions() const
 {
     QVariantList result;
 
@@ -118,7 +118,7 @@ QVariantList DeclarativeMimeType::fileExtentions() const
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeType::setFileExtentions(const QVariantList &newFileExtentions)
+void QDeclarativeMimeType::setFileExtentions(const QVariantList &newFileExtentions)
 {
     QList<QString> result;
 
diff --git a/src/declarative/declarativemimetype_p.h b/src/imports/mimetypes/qdeclarativemimetype_p.h
index e55ab86..ea11172 100644
--- a/src/declarative/declarativemimetype_p.h
+++ b/src/imports/mimetypes/qdeclarativemimetype_p.h
@@ -1,7 +1,7 @@
 #ifndef DECLARATIVE_MIME_TYPE_P_H_INCLUDED
 #define DECLARATIVE_MIME_TYPE_P_H_INCLUDED
 
-#include "mimetype.h"
+#include "qmimetype.h"
 
 #include <QtDeclarative/qdeclarative.h>
 
@@ -9,7 +9,7 @@
 
 // ------------------------------------------------------------------------------------------------
 
-class DeclarativeMimeType : public QObject
+class QDeclarativeMimeType : public QObject
 {
     Q_OBJECT
 
@@ -37,18 +37,18 @@ class DeclarativeMimeType : public QObject
 protected:
     // We keep this destructor with its default value of 0 protected since only
     // QDeclarativePrivate::QDeclarativeElement<T> needs it:
-    DeclarativeMimeType(QObject *theParent = 0);
+    QDeclarativeMimeType(QObject *theParent = 0);
 
 public:
     // We don't allow theParent to have a default value of 0 because in all
     // likelyhood we want to force the caller to specify its QObject so the
     // object will get destroyed in the caller's destructor:
-    DeclarativeMimeType(const QMimeType &other, QObject *theParent);
+    QDeclarativeMimeType(const QMimeType &other, QObject *theParent);
 
-    ~DeclarativeMimeType();
+    ~QDeclarativeMimeType();
 
-    Q_INVOKABLE void assign(DeclarativeMimeType *other);
-    Q_INVOKABLE bool equals(DeclarativeMimeType *other) const;
+    Q_INVOKABLE void assign(QDeclarativeMimeType *other);
+    Q_INVOKABLE bool equals(QDeclarativeMimeType *other) const;
 
     QMimeType mimeType() const;
 
@@ -67,6 +67,6 @@ private:
     QMimeType m_MimeType;
 };
 
-QML_DECLARE_TYPE(DeclarativeMimeType)
+QML_DECLARE_TYPE(QDeclarativeMimeType)
 
 #endif
diff --git a/src/declarative/declarativemimetyperegistry.cpp b/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
index e889888..b10b69a 100644
--- a/src/declarative/declarativemimetyperegistry.cpp
+++ b/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
@@ -1,36 +1,36 @@
-#include "declarativemimetyperegistry_p.h"
+#include "qdeclarativemimetyperegistry_p.h"
 
-#include "declarativemimetype_p.h"
-#include "declarativeserviceaction_p.h"
+#include "qdeclarativemimetype_p.h"
+#include "qdeclarativeserviceaction_p.h"
 
 #include <QtCore/QDebug>
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeMimeTypeRegistry::DeclarativeMimeTypeRegistry(QObject *theParent) :
+QDeclarativeMimeTypeRegistry::QDeclarativeMimeTypeRegistry(QObject *theParent) :
         QObject(theParent),
         m_MimeTypeRegistry()
 {}
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeMimeTypeRegistry::~DeclarativeMimeTypeRegistry()
+QDeclarativeMimeTypeRegistry::~QDeclarativeMimeTypeRegistry()
 {
     //qDebug() << Q_FUNC_INFO;
 }
 
 // ------------------------------------------------------------------------------------------------
 
-QMimeTypeRegistry &DeclarativeMimeTypeRegistry::mimeTypeRegistry()
+QMimeTypeRegistry &QDeclarativeMimeTypeRegistry::mimeTypeRegistry()
 {
     return m_MimeTypeRegistry;
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::insertMimeType (
-                                      DeclarativeMimeType *mimeType
-                                  )
+void QDeclarativeMimeTypeRegistry::insertMimeType (
+                                       QDeclarativeMimeType *mimeType
+                                   )
 {
     if (mimeType == 0) {
         qWarning() << Q_FUNC_INFO << "mimeType:" << mimeType;
@@ -42,7 +42,7 @@ void DeclarativeMimeTypeRegistry::insertMimeType (
 
 // ------------------------------------------------------------------------------------------------
 
-QVariantList DeclarativeMimeTypeRegistry::mimeTypes() const
+QVariantList QDeclarativeMimeTypeRegistry::mimeTypes() const
 {
     QVariantList result;
 
@@ -55,11 +55,11 @@ QVariantList DeclarativeMimeTypeRegistry::mimeTypes() const
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeMimeType *DeclarativeMimeTypeRegistry::findMimeType (
+QDeclarativeMimeType *QDeclarativeMimeTypeRegistry::findMimeType (
                                                       const QMimeTypeName &mimeTypeName
                                                   )
 {
-    return new DeclarativeMimeType (
+    return new QDeclarativeMimeType (
                    m_MimeTypeRegistry.findMimeType(mimeTypeName),
                    this   // <- The new object will be released later
                           //    when this registry is released.
@@ -68,16 +68,16 @@ DeclarativeMimeType *DeclarativeMimeTypeRegistry::findMimeType (
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::removeMimeType (
-                                      const QMimeTypeName &mimeTypeName
-                                  )
+void QDeclarativeMimeTypeRegistry::removeMimeType (
+                                       const QMimeTypeName &mimeTypeName
+                                   )
 {
     m_MimeTypeRegistry.removeMimeType(mimeTypeName);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-QVariantList DeclarativeMimeTypeRegistry::fileExtentions() const
+QVariantList QDeclarativeMimeTypeRegistry::fileExtentions() const
 {
     QVariantList result;
 
@@ -90,18 +90,18 @@ QVariantList DeclarativeMimeTypeRegistry::fileExtentions() const
 
 // ------------------------------------------------------------------------------------------------
 
-QString DeclarativeMimeTypeRegistry::extractFileExtention (
-                                         const QString &fileName
-                                     ) const
+QString QDeclarativeMimeTypeRegistry::extractFileExtention (
+                                          const QString &fileName
+                                      ) const
 {
     return m_MimeTypeRegistry.extractFileExtention(fileName);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-QVariantList DeclarativeMimeTypeRegistry::findMimeTypes (
-                                              const QString &fileExtention
-                                          ) const
+QVariantList QDeclarativeMimeTypeRegistry::findMimeTypes (
+                                               const QString &fileExtention
+                                           ) const
 {
     QVariantList result;
 
@@ -114,18 +114,18 @@ QVariantList DeclarativeMimeTypeRegistry::findMimeTypes (
 
 // ------------------------------------------------------------------------------------------------
 
-QMimeTypeName DeclarativeMimeTypeRegistry::determineMimeType (
-                                               const QByteArray &data
-                                           ) const
+QMimeTypeName QDeclarativeMimeTypeRegistry::determineMimeType (
+                                                const QByteArray &data
+                                            ) const
 {
     return m_MimeTypeRegistry.determineMimeType(data);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::insertServiceAction (
-                                      DeclarativeServiceAction *serviceAction
-                                  )
+void QDeclarativeMimeTypeRegistry::insertServiceAction (
+                                       QDeclarativeServiceAction *serviceAction
+                                   )
 {
     if (serviceAction == 0) {
         qWarning() << Q_FUNC_INFO << "serviceAction:" << serviceAction;
@@ -137,7 +137,7 @@ void DeclarativeMimeTypeRegistry::insertServiceAction (
 
 // ------------------------------------------------------------------------------------------------
 
-QVariantList DeclarativeMimeTypeRegistry::serviceActions() const
+QVariantList QDeclarativeMimeTypeRegistry::serviceActions() const
 {
     QVariantList result;
 
@@ -150,12 +150,12 @@ QVariantList DeclarativeMimeTypeRegistry::serviceActions() const
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeServiceAction *
-    DeclarativeMimeTypeRegistry::findServiceAction (
-                                     const QServiceActionName &serviceActionName
-                                 )
+QDeclarativeServiceAction *
+    QDeclarativeMimeTypeRegistry::findServiceAction (
+                                      const QServiceActionName &serviceActionName
+                                  )
 {
-    return new DeclarativeServiceAction (
+    return new QDeclarativeServiceAction (
                    m_MimeTypeRegistry.findServiceAction(serviceActionName),
                    this   // <- The new object will be released later
                           //    when this registry is released.
@@ -164,72 +164,72 @@ DeclarativeServiceAction *
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::removeServiceAction (
-                                      const QServiceActionName &serviceActionName
-                                  )
+void QDeclarativeMimeTypeRegistry::removeServiceAction (
+                                       const QServiceActionName &serviceActionName
+                                   )
 {
     return m_MimeTypeRegistry.removeServiceAction(serviceActionName);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-bool DeclarativeMimeTypeRegistry::userAlwaysSelectsApplication (
-                                      const QServiceActionName &serviceActionName,
-                                      const QMimeTypeName &mimeTypeName
-                                  ) const
+bool QDeclarativeMimeTypeRegistry::userAlwaysSelectsApplication (
+                                       const QServiceActionName &serviceActionName,
+                                       const QMimeTypeName &mimeTypeName
+                                   ) const
 {
     return m_MimeTypeRegistry.userAlwaysSelectsApplication(serviceActionName, mimeTypeName);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::setUserAlwaysSelectsApplication (
-                                      const QServiceActionName &serviceActionName,
-                                      const QMimeTypeName &mimeTypeName,
-                                      const bool newSetting
-                                  )
+void QDeclarativeMimeTypeRegistry::setUserAlwaysSelectsApplication (
+                                       const QServiceActionName &serviceActionName,
+                                       const QMimeTypeName &mimeTypeName,
+                                       const bool newSetting
+                                   )
 {
     return m_MimeTypeRegistry.setUserAlwaysSelectsApplication(serviceActionName, mimeTypeName, newSetting);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::registerApplication (
-                                      const QApplicationId &applicationId,
-                                      const QServiceActionName &serviceActionName,
-                                      const QMimeTypeName &mimeTypeName
-                                  )
+void QDeclarativeMimeTypeRegistry::registerApplication (
+                                       const QApplicationId &applicationId,
+                                       const QServiceActionName &serviceActionName,
+                                       const QMimeTypeName &mimeTypeName
+                                   )
 {
     return m_MimeTypeRegistry.registerApplication(applicationId, serviceActionName, mimeTypeName);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::increaseApplicationPreference (
-                                      const QApplicationId &applicationId,
-                                      const QServiceActionName &serviceActionName,
-                                      const QMimeTypeName &mimeTypeName
-                                  )
+void QDeclarativeMimeTypeRegistry::increaseApplicationPreference (
+                                       const QApplicationId &applicationId,
+                                       const QServiceActionName &serviceActionName,
+                                       const QMimeTypeName &mimeTypeName
+                                   )
 {
     return m_MimeTypeRegistry.increaseApplicationPreference(applicationId, serviceActionName, mimeTypeName);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::decreaseApplicationPreference (
-                                      const QApplicationId &applicationId,
-                                      const QServiceActionName &serviceActionName,
-                                      const QMimeTypeName &mimeTypeName
-                                  )
+void QDeclarativeMimeTypeRegistry::decreaseApplicationPreference (
+                                       const QApplicationId &applicationId,
+                                       const QServiceActionName &serviceActionName,
+                                       const QMimeTypeName &mimeTypeName
+                                   )
 {
     return m_MimeTypeRegistry.decreaseApplicationPreference(applicationId, serviceActionName, mimeTypeName);
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeMimeTypeRegistry::unregisterApplication (
-                                      const QApplicationId &applicationId
-                                  )
+void QDeclarativeMimeTypeRegistry::unregisterApplication (
+                                       const QApplicationId &applicationId
+                                   )
 {
     return m_MimeTypeRegistry.unregisterApplication(applicationId);
 }
@@ -237,9 +237,9 @@ void DeclarativeMimeTypeRegistry::unregisterApplication (
 // ------------------------------------------------------------------------------------------------
 
 
-QVariantList DeclarativeMimeTypeRegistry::findApplications (
-                                              const QMimeTypeName &mimeTypeName
-                                          ) const
+QVariantList QDeclarativeMimeTypeRegistry::findApplications (
+                                               const QMimeTypeName &mimeTypeName
+                                           ) const
 {
     QVariantList result;
 
@@ -260,10 +260,10 @@ QVariantList DeclarativeMimeTypeRegistry::findApplications (
 
 // ------------------------------------------------------------------------------------------------
 
-QVariantList DeclarativeMimeTypeRegistry::findApplications (
-                                              const QServiceActionName &serviceActionName,
-                                              const QMimeTypeName &mimeTypeName
-                                          ) const
+QVariantList QDeclarativeMimeTypeRegistry::findApplications (
+                                               const QServiceActionName &serviceActionName,
+                                               const QMimeTypeName &mimeTypeName
+                                           ) const
 {
     QVariantList result;
 
diff --git a/src/declarative/declarativemimetyperegistry_p.h b/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
index a2d821c..8a2ee55 100644
--- a/src/declarative/declarativemimetyperegistry_p.h
+++ b/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
@@ -1,18 +1,18 @@
 #ifndef DECLARATIVE_MIME_TYPE_REGISTRY_P_H_INCLUDED
 #define DECLARATIVE_MIME_TYPE_REGISTRY_P_H_INCLUDED
 
-#include "mimetyperegistry.h"
+#include "qmimetyperegistry.h"
 
 #include <QtDeclarative/qdeclarative.h>
 
 #include <QtCore/QObject>
 
-class DeclarativeMimeType;
-class DeclarativeServiceAction;
+class QDeclarativeMimeType;
+class QDeclarativeServiceAction;
 
 // ------------------------------------------------------------------------------------------------
 
-class DeclarativeMimeTypeRegistry : public QObject
+class QDeclarativeMimeTypeRegistry : public QObject
 {
     Q_OBJECT
 
@@ -31,24 +31,24 @@ class DeclarativeMimeTypeRegistry : public QObject
 protected:
     // We keep this destructor with its default value of 0 protected since only
     // QDeclarativePrivate::QDeclarativeElement<T> needs it:
-    DeclarativeMimeTypeRegistry(QObject *theParent = 0);
+    QDeclarativeMimeTypeRegistry(QObject *theParent = 0);
 
 public:
-    ~DeclarativeMimeTypeRegistry();
+    ~QDeclarativeMimeTypeRegistry();
 
     QMimeTypeRegistry &mimeTypeRegistry();
 
     // --------------------------------------------------------------------------------------------
 
     Q_INVOKABLE void insertMimeType (
-                         DeclarativeMimeType *mimeType
+                         QDeclarativeMimeType *mimeType
                      );
 
     QVariantList mimeTypes() const;
 
-    Q_INVOKABLE DeclarativeMimeType *findMimeType (
-                                         const QString &mimeTypeName
-                                     );
+    Q_INVOKABLE QDeclarativeMimeType *findMimeType (
+                                          const QString &mimeTypeName
+                                      );
 
     Q_INVOKABLE void removeMimeType (
                          const QString &mimeTypeName
@@ -75,14 +75,14 @@ public:
     // --------------------------------------------------------------------------------------------
 
     Q_INVOKABLE void insertServiceAction (
-                         DeclarativeServiceAction *serviceAction
+                         QDeclarativeServiceAction *serviceAction
                      );
 
     QVariantList serviceActions() const;
 
-    Q_INVOKABLE DeclarativeServiceAction *findServiceAction (
-                                              const QString &serviceActionName
-                                          );
+    Q_INVOKABLE QDeclarativeServiceAction *findServiceAction (
+                                               const QString &serviceActionName
+                                           );
 
     Q_INVOKABLE void removeServiceAction (
                          const QString &serviceActionName
@@ -140,6 +140,6 @@ private:
     QMimeTypeRegistry m_MimeTypeRegistry;
 };
 
-QML_DECLARE_TYPE(DeclarativeMimeTypeRegistry)
+QML_DECLARE_TYPE(QDeclarativeMimeTypeRegistry)
 
 #endif
diff --git a/src/declarative/declarativeserviceaction.cpp b/src/imports/mimetypes/qdeclarativeserviceaction.cpp
index a070b42..1af82df 100644
--- a/src/declarative/declarativeserviceaction.cpp
+++ b/src/imports/mimetypes/qdeclarativeserviceaction.cpp
@@ -1,31 +1,31 @@
-#include "declarativeserviceaction_p.h"
+#include "qdeclarativeserviceaction_p.h"
 
 #include <QtCore/QDebug>
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeServiceAction::DeclarativeServiceAction(QObject *theParent) :
+QDeclarativeServiceAction::QDeclarativeServiceAction(QObject *theParent) :
         QObject(theParent),
         m_ServiceAction()
 {}
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeServiceAction::DeclarativeServiceAction(const QServiceAction &other, QObject *theParent) :
+QDeclarativeServiceAction::QDeclarativeServiceAction(const QServiceAction &other, QObject *theParent) :
         QObject(theParent),
         m_ServiceAction(other)
 {}
 
 // ------------------------------------------------------------------------------------------------
 
-DeclarativeServiceAction::~DeclarativeServiceAction()
+QDeclarativeServiceAction::~QDeclarativeServiceAction()
 {
     //qDebug() << Q_FUNC_INFO << "name():" << name();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeServiceAction::assign(DeclarativeServiceAction *other)
+void QDeclarativeServiceAction::assign(QDeclarativeServiceAction *other)
 {
     if (other == 0) {
         qWarning() << Q_FUNC_INFO << "other:" << other;
@@ -37,7 +37,7 @@ void DeclarativeServiceAction::assign(DeclarativeServiceAction *other)
 
 // ------------------------------------------------------------------------------------------------
 
-bool DeclarativeServiceAction::equals(DeclarativeServiceAction *other) const
+bool QDeclarativeServiceAction::equals(QDeclarativeServiceAction *other) const
 {
     if (other == 0) {
         qWarning() << Q_FUNC_INFO << "other:" << other;
@@ -49,56 +49,56 @@ bool DeclarativeServiceAction::equals(DeclarativeServiceAction *other) const
 
 // ------------------------------------------------------------------------------------------------
 
-QServiceAction DeclarativeServiceAction::serviceAction() const
+QServiceAction QDeclarativeServiceAction::serviceAction() const
 {
     return m_ServiceAction;
 }
 
 // ------------------------------------------------------------------------------------------------
 
-bool DeclarativeServiceAction::isValid() const
+bool QDeclarativeServiceAction::isValid() const
 {
     return m_ServiceAction.isValid();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-const QServiceActionName &DeclarativeServiceAction::name() const
+const QServiceActionName &QDeclarativeServiceAction::name() const
 {
     return m_ServiceAction.name();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeServiceAction::setName(const QServiceActionName &newName)
+void QDeclarativeServiceAction::setName(const QServiceActionName &newName)
 {
     m_ServiceAction = QServiceAction(newName, m_ServiceAction.displayName(), m_ServiceAction.iconUrl());
 }
 
 // ------------------------------------------------------------------------------------------------
 
-QString DeclarativeServiceAction::displayName() const
+QString QDeclarativeServiceAction::displayName() const
 {
     return m_ServiceAction.displayName();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeServiceAction::setDisplayName(const QString &newDisplayName)
+void QDeclarativeServiceAction::setDisplayName(const QString &newDisplayName)
 {
     m_ServiceAction = QServiceAction(m_ServiceAction.name(), newDisplayName, m_ServiceAction.iconUrl());
 }
 
 // ------------------------------------------------------------------------------------------------
 
-QString DeclarativeServiceAction::iconUrl() const
+QString QDeclarativeServiceAction::iconUrl() const
 {
     return m_ServiceAction.iconUrl();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-void DeclarativeServiceAction::setIconUrl(const QString &newIconUrl)
+void QDeclarativeServiceAction::setIconUrl(const QString &newIconUrl)
 {
     m_ServiceAction = QServiceAction(m_ServiceAction.name(), m_ServiceAction.displayName(), newIconUrl);
 }
diff --git a/src/declarative/declarativeserviceaction_p.h b/src/imports/mimetypes/qdeclarativeserviceaction_p.h
index aa07078..9fcb33f 100644
--- a/src/declarative/declarativeserviceaction_p.h
+++ b/src/imports/mimetypes/qdeclarativeserviceaction_p.h
@@ -1,7 +1,7 @@
 #ifndef DECLARATIVE_SERVICE_ACTION_P_INCLUDED
 #define DECLARATIVE_SERVICE_ACTION_P_INCLUDED
 
-#include "serviceaction.h"
+#include "qserviceaction.h"
 
 #include <QtDeclarative/qdeclarative.h>
 
@@ -9,7 +9,7 @@
 
 // ------------------------------------------------------------------------------------------------
 
-class DeclarativeServiceAction : public QObject
+class QDeclarativeServiceAction : public QObject
 {
     Q_OBJECT
 
@@ -32,18 +32,18 @@ class DeclarativeServiceAction : public QObject
 protected:
     // We keep this destructor with its default value of 0 protected since only
     // QDeclarativePrivate::QDeclarativeElement<T> needs it:
-    DeclarativeServiceAction(QObject *theParent = 0);
+    QDeclarativeServiceAction(QObject *theParent = 0);
 
 public:
     // We don't allow theParent to have a default value of 0 because in all
     // likelyhood we want to force the caller to specify its QObject so the
     // object will get destroyed in the caller's destructor:
-    DeclarativeServiceAction(const QServiceAction &other, QObject *theParent);
+    QDeclarativeServiceAction(const QServiceAction &other, QObject *theParent);
 
-    ~DeclarativeServiceAction();
+    ~QDeclarativeServiceAction();
 
-    Q_INVOKABLE void assign(DeclarativeServiceAction *other);
-    Q_INVOKABLE bool equals(DeclarativeServiceAction *other) const;
+    Q_INVOKABLE void assign(QDeclarativeServiceAction *other);
+    Q_INVOKABLE bool equals(QDeclarativeServiceAction *other) const;
 
     QServiceAction serviceAction() const;
 
@@ -60,6 +60,6 @@ private:
     QServiceAction m_ServiceAction;
 };
 
-QML_DECLARE_TYPE(DeclarativeServiceAction)
+QML_DECLARE_TYPE(QDeclarativeServiceAction)
 
 #endif
diff --git a/src/declarative/qmldir b/src/imports/mimetypes/qmldir
index a8d4763..a8d4763 100644
--- a/src/declarative/qmldir
+++ b/src/imports/mimetypes/qmldir
diff --git a/src/mimetypes/mimetypes.pro b/src/mimetypes/mimetypes.pro
index 814fd0c..642b30e 100644
--- a/src/mimetypes/mimetypes.pro
+++ b/src/mimetypes/mimetypes.pro
@@ -10,7 +10,7 @@ QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi           -Wshadow -Wno-long-lo
 # dependency management
 QMAKE_CXXFLAGS += -MMD
 include_dependencies.target = include_dependencies
-include_dependencies.commands = @if grep \"^include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi
+include_dependencies.commands = @if grep \"^-include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"-include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi
 QMAKE_EXTRA_TARGETS += include_dependencies
 POST_TARGETDEPS += include_dependencies
 
@@ -20,14 +20,14 @@ API_DIR = ../..
 INCLUDEPATH += $$API_DIR
 
 
-SOURCES += $$API_DIR/src/mimetypes/mimetype.cpp \
-           $$API_DIR/src/mimetypes/mimetyperegistry.cpp \
-           mimetyperegistry_empty.cpp \
-           $$API_DIR/src/mimetypes/serviceaction.cpp
+SOURCES += $$API_DIR/src/mimetypes/qmimetype.cpp \
+           $$API_DIR/src/mimetypes/qmimetyperegistry.cpp \
+           qmimetyperegistry_empty.cpp \
+           $$API_DIR/src/mimetypes/qserviceaction.cpp
 
-HEADERS += $$API_DIR/src/mimetypes/applicationfwd.h \
-           $$API_DIR/src/mimetypes/mimetype.h \
-           $$API_DIR/src/mimetypes/mimetype_p.h \
-           $$API_DIR/src/mimetypes/mimetyperegistry.h \
-           $$API_DIR/src/mimetypes/serviceaction.h \
-           $$API_DIR/src/mimetypes/serviceaction_p.h
+HEADERS += $$API_DIR/src/mimetypes/qmimetypesfwd.h \
+           $$API_DIR/src/mimetypes/qmimetype.h \
+           $$API_DIR/src/mimetypes/qmimetype_p.h \
+           $$API_DIR/src/mimetypes/qmimetyperegistry.h \
+           $$API_DIR/src/mimetypes/qserviceaction.h \
+           $$API_DIR/src/mimetypes/qserviceaction_p.h
diff --git a/src/mimetypes/mimetype.cpp b/src/mimetypes/qmimetype.cpp
index c2ab82a..5ef93d5 100644
--- a/src/mimetypes/mimetype.cpp
+++ b/src/mimetypes/qmimetype.cpp
@@ -1,6 +1,6 @@
-#include "mimetype.h"
+#include "qmimetype.h"
 
-#include "mimetype_p.h"
+#include "qmimetype_p.h"
 
 // ------------------------------------------------------------------------------------------------
 
diff --git a/src/mimetypes/mimetype.h b/src/mimetypes/qmimetype.h
index eaa183f..eaa183f 100644
--- a/src/mimetypes/mimetype.h
+++ b/src/mimetypes/qmimetype.h
diff --git a/src/mimetypes/mimetype_p.h b/src/mimetypes/qmimetype_p.h
index a7315ca..5252280 100644
--- a/src/mimetypes/mimetype_p.h
+++ b/src/mimetypes/qmimetype_p.h
@@ -1,8 +1,6 @@
 #ifndef MIME_TYPE_P_H_INCLUDED
 #define MIME_TYPE_P_H_INCLUDED
 
-#include "mimetype.h"
-
 #include <QtCore/QList>
 #include <QtCore/QString>
 
diff --git a/src/mimetypes/mimetyperegistry.cpp b/src/mimetypes/qmimetyperegistry.cpp
index 49f1d43..e0bb52d 100644
--- a/src/mimetypes/mimetyperegistry.cpp
+++ b/src/mimetypes/qmimetyperegistry.cpp
@@ -1,4 +1,4 @@
-#include "mimetyperegistry.h"
+#include "qmimetyperegistry.h"
 
 #include <QtCore/QByteArray>
 
diff --git a/src/mimetypes/mimetyperegistry.h b/src/mimetypes/qmimetyperegistry.h
index 9300d4a..29f5ece 100644
--- a/src/mimetypes/mimetyperegistry.h
+++ b/src/mimetypes/qmimetyperegistry.h
@@ -1,9 +1,9 @@
 #ifndef MIMETYPES_H_INCLUDED
 #define MIMETYPES_H_INCLUDED
 
-#include "applicationfwd.h"
-#include "mimetype.h"
-#include "serviceaction.h"
+#include "qmimetype.h"
+#include "qmimetypesfwd.h"
+#include "qserviceaction.h"
 
 #include <QtCore/QList>
 #include <QtCore/QPair>
diff --git a/src/mimetypes/mimetyperegistry_empty.cpp b/src/mimetypes/qmimetyperegistry_empty.cpp
index 1ed8902..1b948c4 100644
--- a/src/mimetypes/mimetyperegistry_empty.cpp
+++ b/src/mimetypes/qmimetyperegistry_empty.cpp
@@ -1,6 +1,4 @@
-#include "mimetyperegistry.h"
-
-#include <QtCore/QFuture>
+#include "qmimetyperegistry.h"
 
 // ------------------------------------------------------------------------------------------------
 
@@ -75,9 +73,18 @@ QString QMimeTypeRegistry::extractFileExtention (
                                const QString &fileName
                            ) const
 {
-    Q_UNUSED(fileName)
+    QString result;
+
+    const QList<QString> theFileExtentions (fileExtentions());
+
+    foreach (const QString &fileExtention, theFileExtentions) {
+        if (fileExtention.length() > result.length() &&
+                fileName.right(fileExtention.length()) == fileExtention) {
+            result = fileExtention;
+        }
+    }
 
-    return QString();
+    return result;
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/src/mimetypes/applicationfwd.h b/src/mimetypes/qmimetypesfwd.h
index 7df1e93..7df1e93 100644
--- a/src/mimetypes/applicationfwd.h
+++ b/src/mimetypes/qmimetypesfwd.h
diff --git a/src/mimetypes/serviceaction.cpp b/src/mimetypes/qserviceaction.cpp
index 821d965..ba75c8a 100644
--- a/src/mimetypes/serviceaction.cpp
+++ b/src/mimetypes/qserviceaction.cpp
@@ -1,6 +1,6 @@
-#include "serviceaction.h"
+#include "qserviceaction.h"
 
-#include "serviceaction_p.h"
+#include "qserviceaction_p.h"
 
 // ------------------------------------------------------------------------------------------------
 
diff --git a/src/mimetypes/serviceaction.h b/src/mimetypes/qserviceaction.h
index 5fa2e3a..5fa2e3a 100644
--- a/src/mimetypes/serviceaction.h
+++ b/src/mimetypes/qserviceaction.h
diff --git a/src/mimetypes/serviceaction_p.h b/src/mimetypes/qserviceaction_p.h
index d5d0dba..a67127e 100644
--- a/src/mimetypes/serviceaction_p.h
+++ b/src/mimetypes/qserviceaction_p.h
@@ -1,8 +1,6 @@
 #ifndef SERVICE_ACTION_P_H_INCLUDED
 #define SERVICE_ACTION_P_H_INCLUDED
 
-#include "serviceaction.h"
-
 #include <QtCore/QString>
 
 // ------------------------------------------------------------------------------------------------
diff --git a/src/src.pro b/src/src.pro
index 753ecef..a2e5f2f 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += mimetypes declarative
+SUBDIRS += mimetypes imports
diff --git a/unittests/declarative/tst_declarative_mimetypes.qml b/unittests/declarative/tst_declarative_mimetypes.qml
index 81d1654..a3c0e5a 100644
--- a/unittests/declarative/tst_declarative_mimetypes.qml
+++ b/unittests/declarative/tst_declarative_mimetypes.qml
@@ -460,5 +460,31 @@ TestCase {
 
         compare(resultOfFindApplications2.length, 1)
         compare(resultOfFindApplications2[0], gwenviewApplicationId)
+
+        // ----------------------------------------------------------------------------------------
+
+        mimeTypeRegistry.setUserAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName(), false)
+
+        mimeTypeRegistry.unregisterApplication(showimgApplicationId)
+
+        compare(mimeTypeRegistry.userAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName()), true)
+
+        resultOfFindApplications1 = mimeTypeRegistry.findApplications(pngMimeTypeName())
+
+        compare(resultOfFindApplications1.length, 2)
+        compare(resultOfFindApplications1[0][0], gwenviewApplicationId)
+        compare(resultOfFindApplications1[0][1], editServiceActionName())   // edit is before share
+        compare(resultOfFindApplications1[1][0], gwenviewApplicationId)
+        compare(resultOfFindApplications1[1][1], shareOnPicasaWebAlbumsName())
+
+        resultOfFindApplications2 = mimeTypeRegistry.findApplications(editServiceActionName(), pngMimeTypeName())
+
+        compare(resultOfFindApplications2.length, 1)
+        compare(resultOfFindApplications2[0], gwenviewApplicationId)
+
+        resultOfFindApplications2 = mimeTypeRegistry.findApplications(shareOnPicasaWebAlbumsName(), pngMimeTypeName())
+
+        compare(resultOfFindApplications2.length, 1)
+        compare(resultOfFindApplications2[0], gwenviewApplicationId)
     }
 }
diff --git a/unittests/tst_mimetypes-empty.cpp b/unittests/tst_mimetypes-empty.cpp
index a184fc4..c9066bc 100644
--- a/unittests/tst_mimetypes-empty.cpp
+++ b/unittests/tst_mimetypes-empty.cpp
@@ -1,6 +1,6 @@
 #include "tst_mimetypes.h"
 
-#include "mimetyperegistry.h"
+#include "qmimetyperegistry.h"
 
 #include <QtTest/QtTest>
 
@@ -643,6 +643,34 @@ void tst_mimetypes::test_QMimeTypeRegistry_findApplications()
 
     QCOMPARE(resultOfFindApplications2.length(), 1);
     QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId);
+
+    // --------------------------------------------------------------------------------------------
+
+    mimeTypeRegistry->setUserAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName(), false);
+
+    mimeTypeRegistry->unregisterApplication(showimgApplicationId);
+
+    QVERIFY(mimeTypeRegistry->userAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName()));
+
+    resultOfFindApplications1 = mimeTypeRegistry->findApplications(pngMimeTypeName());
+
+    QCOMPARE(resultOfFindApplications1.length(), 2);
+    QCOMPARE(resultOfFindApplications1[0].first, gwenviewApplicationId);
+    QCOMPARE(resultOfFindApplications1[0].second, editServiceActionName());   // edit is before share
+    QCOMPARE(resultOfFindApplications1[1].first, gwenviewApplicationId);
+    QCOMPARE(resultOfFindApplications1[1].second, shareOnPicasaWebAlbumsName);
+
+    resultOfFindApplications2 =
+        mimeTypeRegistry->findApplications(editServiceActionName(), pngMimeTypeName());
+
+    QCOMPARE(resultOfFindApplications2.length(), 1);
+    QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId);
+
+    resultOfFindApplications2 =
+        mimeTypeRegistry->findApplications(shareOnPicasaWebAlbumsName, pngMimeTypeName());
+
+    QCOMPARE(resultOfFindApplications2.length(), 1);
+    QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId);
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/unittests/unittests.pro b/unittests/unittests.pro
index 88a7ac7..0c5c407 100644
--- a/unittests/unittests.pro
+++ b/unittests/unittests.pro
@@ -8,7 +8,7 @@ QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -ansi -pedantic -Wshadow -Wno-long-lo
 # dependency management
 QMAKE_CXXFLAGS += -MMD
 include_dependencies.target = include_dependencies
-include_dependencies.commands = @if grep \"^include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi
+include_dependencies.commands = @if grep \"^-include \\*.d\" Makefile >/dev/null 2>&1; then echo \"Dependency files are already included.\"; else echo \"-include *.d\" >> Makefile; echo \"Please rerun make because dependency files will be included next time.\"; fi
 QMAKE_EXTRA_TARGETS += include_dependencies
 POST_TARGETDEPS += include_dependencies