From 0dd8d6e60a850b42b75d64ccc7eb793ae5c1549b Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Mon, 11 Oct 2010 17:09:47 +0100
Subject: Fix compilation of two autotests

These tests did not link when QT_BUILD_INTERNAL was not defined, as one
of the private headers was causing QFileInfoGatherer::~QFileInfoGatherer to
be referenced

Reviewed-By: Thomas Zander
---
 tests/auto/qfiledialog/tst_qfiledialog.cpp           | 4 ++++
 tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index ca7c445..5d369b4 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -61,9 +61,13 @@
 #include <qlineedit.h>
 #include <qlayout.h>
 #include "../../shared/util.h"
+#if defined QT_BUILD_INTERNAL
 #include "../../../src/gui/dialogs/qsidebar_p.h"
 #include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
 #include "../../../src/gui/dialogs/qfiledialog_p.h"
+#endif
+#include <QFileDialog>
+#include <QFileSystemModel>
 
 #include "../network-settings.h"
 
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index c234c96..a391eb9 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -41,7 +41,10 @@
 
 
 #include <QtTest/QtTest>
+#ifdef QT_BUILD_INTERNAL
 #include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
+#endif
+#include <QFileSystemModel>
 #include <QFileIconProvider>
 #include <QTreeView>
 #include <QHeaderView>
@@ -826,8 +829,10 @@ void tst_QFileSystemModel::sort()
     MyFriendFileSystemModel *myModel = new MyFriendFileSystemModel();
     QTreeView *tree = new QTreeView();
 
+#ifdef QT_BUILD_INTERNAL
     if (fileDialogMode)
         myModel->d_func()->disableRecursiveSort = true;
+#endif
 
     QDir dir(QDir::tempPath());
     //initialize the randomness
-- 
cgit v0.12