diff options
| author | David Faure <david.faure@kdab.com> | 2017-11-24 10:53:00 +0100 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2018-01-02 09:31:37 +0000 |
| commit | bb6f0a5291f8a51d7dc21f13463dd2a0b27ed916 (patch) | |
| tree | 620b02feff14ddea2986870fa71d88e7b888d3d4 | |
| parent | 739611221c8346eb3800753f0acf354c42bf20a5 (diff) | |
QMimeDatabase: only export var for unittests if QT_BUILD_INTERNAL
Change-Id: I7fa25b64cf39667c8cea95431f68baab623c8a2a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 files changed, 10 insertions, 1 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index f90fd12e3b..edc414fa0a 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -79,7 +79,12 @@ QMimeDatabasePrivate::~QMimeDatabasePrivate() qDeleteAll(m_providers); } -Q_CORE_EXPORT int qmime_secondsBetweenChecks = 5; // exported for the unit test +#ifdef QT_BUILD_INTERNAL +Q_CORE_EXPORT +#else +static const +#endif +int qmime_secondsBetweenChecks = 5; bool QMimeDatabasePrivate::shouldCheck() { diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro index e661ff8412..53bb012f7c 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro @@ -1,5 +1,7 @@ CONFIG += testcase +requires(qtConfig(private_tests)) + TARGET = tst_qmimedatabase-cache QT = core testlib concurrent diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro index 160f359116..7b27ee4217 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro @@ -1,5 +1,7 @@ CONFIG += testcase +requires(qtConfig(private_tests)) + TARGET = tst_qmimedatabase-xml QT = core testlib concurrent |