aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@digia.com>2013-02-13 17:47:31 +0100
committerhjk <hjk121@nokiamail.com>2013-03-06 15:12:20 +0100
commitbebf8d50a9716a296e7646fde77acf2de42b0c4c (patch)
treeeb87a42128a03f10bb493d70eef2b071ffc73d8c
parentcc454d11fca814310c5f1a0aaf582253ffd4532a (diff)
tests: let tst_dumpers compile with Qt4
Change-Id: I34851ebfc054f0f8265e5ce1623e0db956aab085 Reviewed-by: hjk <hjk121@nokiamail.com>
-rw-r--r--tests/auto/debugger/dumpers.pro1
-rw-r--r--tests/auto/debugger/temporarydir.h211
-rw-r--r--tests/auto/debugger/tst_dumpers.cpp3
3 files changed, 213 insertions, 2 deletions
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 95df5271b1..9c36d85cef 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -24,6 +24,7 @@ HEADERS += \
$$DEBUGGERDIR/debuggerprotocol.h \
$$DEBUGGERDIR/watchdata.h \
$$DEBUGGERDIR/watchutils.h \
+ temporarydir.h
!isEmpty(vcproj) {
DEFINES += DUMPERDIR=\"$$DUMPERDIR\"
diff --git a/tests/auto/debugger/temporarydir.h b/tests/auto/debugger/temporarydir.h
new file mode 100644
index 0000000000..2c6775cafb
--- /dev/null
+++ b/tests/auto/debugger/temporarydir.h
@@ -0,0 +1,211 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+// this file has been adapted from TemporaryDir implementation of Qt5
+
+#ifndef __QTEMPORARYDIR_H_INCLUDED__
+#define __QTEMPORARYDIR_H_INCLUDED__
+
+#if QT_VERSION >= 0x050000
+ #include <QTemporaryDir>
+#else // QT_VERSION < 0x050000
+
+#include <QDir>
+#include <stdlib.h> // mkdtemp
+
+QT_BEGIN_NAMESPACE
+
+//************* TemporaryDirPrivate
+class TemporaryDirPrivate
+{
+public:
+ TemporaryDirPrivate();
+ ~TemporaryDirPrivate();
+
+ void create(const QString &templateName);
+
+ QString path;
+ bool autoRemove;
+ bool success;
+};
+
+TemporaryDirPrivate::TemporaryDirPrivate()
+ : autoRemove(true),
+ success(false)
+{
+}
+
+TemporaryDirPrivate::~TemporaryDirPrivate()
+{
+}
+
+static QString defaultTemplateName()
+{
+ QString baseName;
+ baseName = QLatin1String("qt_temp");
+ return QDir::tempPath() + QLatin1Char('/') + baseName + QLatin1String("-XXXXXX");
+}
+
+#ifdef Q_OS_WIN
+static char *mkdtemp(char *templateName)
+{
+ static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+ const size_t length = strlen(templateName);
+ char *XXXXXX = templateName + length - 6;
+ if ((length < 6u) || strncmp(XXXXXX, "XXXXXX", 6))
+ return 0;
+ for (int i = 0; i < 256; ++i) {
+ int v = qrand();
+ /* Fill in the random bits. */
+ XXXXXX[0] = letters[v % 62];
+ v /= 62;
+ XXXXXX[1] = letters[v % 62];
+ v /= 62;
+ XXXXXX[2] = letters[v % 62];
+ v /= 62;
+ XXXXXX[3] = letters[v % 62];
+ v /= 62;
+ XXXXXX[4] = letters[v % 62];
+ v /= 62;
+ XXXXXX[5] = letters[v % 62];
+ QString templateNameStr = QFile::decodeName(templateName);
+ QFileSystemEntry fileSystemEntry(templateNameStr);
+ if (QFileSystemEngine::createDirectory(fileSystemEntry, false)) {
+ QSystemError error;
+ QFileSystemEngine::setPermissions(fileSystemEntry,
+ QFile::ReadOwner |
+ QFile::WriteOwner |
+ QFile::ExeOwner, error);
+ if (error.error() != 0)
+ continue;
+ return templateName;
+ }
+ }
+ return 0;
+}
+#endif
+
+void TemporaryDirPrivate::create(const QString &templateName)
+{
+ QByteArray buffer = QFile::encodeName(templateName);
+ if (!buffer.endsWith("XXXXXX"))
+ buffer += "XXXXXX";
+ if (mkdtemp(buffer.data())) { // modifies buffer
+ success = true;
+ path = QFile::decodeName(buffer.constData());
+ }
+}
+
+//************* TemporaryDir
+static bool removeRecursively(QDir directory)
+{
+ if (!directory.exists())
+ return true;
+ bool success = true;
+ QFileInfoList filesAndDirs = directory.entryInfoList(QDir::AllEntries | QDir::Hidden
+ | QDir::System | QDir::NoDotAndDotDot);
+ foreach (QFileInfo fdInfo, filesAndDirs) {
+ if (fdInfo.isDir())
+ success &= removeRecursively(fdInfo.dir());
+ else
+ success &= directory.remove(fdInfo.fileName());
+ }
+ if (success) {
+ QDir parent(directory.absolutePath());
+ success = parent.cdUp();
+ if (success)
+ success = parent.rmdir(directory.dirName());
+ }
+ return success;
+}
+
+class TemporaryDir
+{
+public:
+ TemporaryDir();
+ explicit TemporaryDir(const QString &templateName);
+ ~TemporaryDir();
+
+ void setAutoRemove(bool b);
+ bool remove();
+ QString path() const;
+
+private:
+ QScopedPointer<TemporaryDirPrivate> d_ptr;
+
+ Q_DISABLE_COPY(TemporaryDir)
+};
+
+TemporaryDir::TemporaryDir()
+ : d_ptr(new TemporaryDirPrivate)
+{
+ d_ptr->create(defaultTemplateName());
+}
+
+TemporaryDir::TemporaryDir(const QString &templateName)
+ : d_ptr(new TemporaryDirPrivate)
+{
+ if (templateName.isEmpty())
+ d_ptr->create(defaultTemplateName());
+ else
+ d_ptr->create(templateName);
+}
+
+TemporaryDir::~TemporaryDir()
+{
+ if (d_ptr->autoRemove)
+ remove();
+}
+
+QString TemporaryDir::path() const
+{
+ return d_ptr->path;
+}
+
+void TemporaryDir::setAutoRemove(bool b)
+{
+ d_ptr->autoRemove = b;
+}
+
+bool TemporaryDir::remove()
+{
+ if (!d_ptr->success)
+ return false;
+ Q_ASSERT(!path().isEmpty());
+ Q_ASSERT(path() != QLatin1String("."));
+ return removeRecursively(QDir(path()));
+}
+
+QT_END_NAMESPACE
+
+typedef TemporaryDir QTemporaryDir;
+
+#endif // QT_VERSION < 0x050000
+
+#endif // __QTEMPORARYDIR_H_INCLUDED__
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index add73312db..df013a072c 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -34,8 +34,7 @@
#include <CppRewriter.h>
#include <QtTest>
-#include <QTemporaryFile>
-#include <QTemporaryDir>
+#include "temporarydir.h"
using namespace Debugger;
using namespace Internal;