test: fixed tst_qfilesystemmodel and removed insignificant_test

tst_qfilesystemmodel::sort uses some internal API to affect the sorting
behavior.  This means that part of the test must be disabled when
private symbols aren't available.

Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
(cherry picked from commit 4e84be2876543c1bfcab3b854c92a7edade4144b)
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

2 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
index 716f72f..ba28441 100644
--- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
+++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
@@ -13,5 +13,3 @@ symbian: {
     DEPLOYMENT += dummyDeploy
     LIBS += -lefsrv
 }
-
-CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 01d017d..20dfb59 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -909,12 +909,16 @@ void tst_QFileSystemModel::sort()
     expectedOrder << tempFile2.fileName() << tempFile.fileName() << dirPath + QChar('/') + "." << dirPath + QChar('/') + "..";
     //File dialog Mode means sub trees are not sorted, only the current root
     if (fileDialogMode) {
+       // FIXME: we were only able to disableRecursiveSort in developer builds, so we can only
+       // stably perform this test for developer builds
+#ifdef QT_BUILD_INTERNAL
        QList<QString> actualRows;
         for(int i = 0; i < myModel->rowCount(parent); ++i)
         {
             actualRows << dirPath + QChar('/') + myModel->index(i, 1, parent).data(QFileSystemModel::FileNameRole).toString();
         }
         QVERIFY(actualRows != expectedOrder);
+#endif
     } else {
         for(int i = 0; i < myModel->rowCount(parent); ++i)
         {