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>

3 files changed, 56 insertions, 2 deletions

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