diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:39:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:46:20 +0100 |
| commit | 246799d8a7bf42c1f22fca7ef6d77e8d58054bad (patch) | |
| tree | a0b92a804d7d2a30cd68fa327df5777d8bcc36ba /src/testlib/qtestcase.cpp | |
| parent | 5ad191850becd7dc1d61d0975f141a5db64e6373 (diff) | |
| parent | 02cc57f4edbae450ecfa8368052afa44f8aeee19 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
examples/network/network-chat/peermanager.cpp
src/widgets/util/qsystemtrayicon.cpp
src/widgets/util/qsystemtrayicon_qpa.cpp
src/widgets/util/qsystemtrayicon_win.cpp
src/widgets/util/qsystemtrayicon_x11.cpp
Change-Id: I1c026df83818c0ccaf956980370e7522960627db
Diffstat (limited to 'src/testlib/qtestcase.cpp')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 7485941c0f..19d135e15f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1953,6 +1953,7 @@ static inline bool isWindowsBuildDirectory(const QString &dirName) } #endif +#if QT_CONFIG(temporaryfile) /*! Extracts a directory from resources to disk. The content is extracted recursively to a temporary folder. The extracted content is removed @@ -2013,6 +2014,7 @@ QSharedPointer<QTemporaryDir> QTest::qExtractTestData(const QString &dirName) return result; } +#endif // QT_CONFIG(temporaryfile) /*! \internal */ |