summaryrefslogtreecommitdiffstats
path: root/src/libs/kdtools
diff options
context:
space:
mode:
authortjenssen <tim.jenssen@nokia.com>2012-08-08 17:31:38 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2012-08-10 13:12:47 +0200
commit9cad5d54cf0d78e92b4ee831299d83b657f42f2e (patch)
treee1914be8eadfd06ad64ff5dd31d200a4cf95df86 /src/libs/kdtools
parent0188b08e8dc218fb66f59522ffa7c02643a9577a (diff)
Fixes required for errorless MinGW-w64 compilation are done.
Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/kdtools')
-rw-r--r--src/libs/kdtools/kdsavefile.cpp11
-rw-r--r--src/libs/kdtools/kdtools.pri2
-rw-r--r--src/libs/kdtools/kdupdaterupdateoperations.cpp25
3 files changed, 21 insertions, 17 deletions
diff --git a/src/libs/kdtools/kdsavefile.cpp b/src/libs/kdtools/kdsavefile.cpp
index 94ed1aa36..5a81ad424 100644
--- a/src/libs/kdtools/kdsavefile.cpp
+++ b/src/libs/kdtools/kdsavefile.cpp
@@ -28,7 +28,8 @@
#include <QtCore/QTemporaryFile>
#ifdef Q_OS_WIN
-# include <io.h>
+ #include <io.h>
+ #include <share.h> // PQR for MinGW-w64: Required for _SH_DENYRW
#endif
#include <memory>
#include <sys/stat.h>
@@ -92,9 +93,11 @@ static QString makeAbsolute(const QString &path)
static int myOpen(const QString &path, int flags, int mode)
{
#ifdef Q_OS_WIN
- int fd;
- _wsopen_s(&fd, reinterpret_cast<const wchar_t *>(path.utf16()), flags, _SH_DENYRW, mode);
- return fd;
+ // PQR for MinGW-w64: _wsopen_s doesn't exist in MSVCRT.dll, let's use _wsopen.
+ return _wsopen(reinterpret_cast<const wchar_t *>(path.utf16()), flags, _SH_DENYRW, mode);
+ //int fd;
+ //_wsopen_s(&fd, reinterpret_cast<const wchar_t *>(path.utf16()), flags, _SH_DENYRW, mode);
+ //return fd;
#else
return open(QFile::encodeName(path).constData(), flags, mode);
#endif
diff --git a/src/libs/kdtools/kdtools.pri b/src/libs/kdtools/kdtools.pri
index a83243502..6023fdee8 100644
--- a/src/libs/kdtools/kdtools.pri
+++ b/src/libs/kdtools/kdtools.pri
@@ -17,7 +17,7 @@ HEADERS += $$PWD/kdtoolsglobal.h \
$$PWD/kdsysinfo.h
SOURCES += $$PWD/kdjob.cpp \
- $$PWD/kdgenericfactory.cpp \
+# $$PWD/kdgenericfactory.cpp \ # this has no content
$$PWD/kdselfrestarter.cpp \
$$PWD/kdsavefile.cpp \
$$PWD/kdrunoncechecker.cpp \
diff --git a/src/libs/kdtools/kdupdaterupdateoperations.cpp b/src/libs/kdtools/kdupdaterupdateoperations.cpp
index 6f934abe8..fa8f3ce0d 100644
--- a/src/libs/kdtools/kdupdaterupdateoperations.cpp
+++ b/src/libs/kdtools/kdupdaterupdateoperations.cpp
@@ -104,8 +104,8 @@ void CopyOperation::backup()
setValue(QLatin1String("backupOfExistingDestination"), backupFileName(dest));
- // race condition: The backup file could get created
- // by another process right now. But this is the same
+ // race condition: The backup file could get created
+ // by another process right now. But this is the same
// in QFile::copy...
const bool success = QFile::rename(dest, value(QLatin1String("backupOfExistingDestination")).toString());
if (!success)
@@ -179,9 +179,9 @@ QDomDocument CopyOperation::toXml() const
// we don't want to save the backupOfExistingDestination
if (!hasValue(QLatin1String("backupOfExistingDestination")))
return UpdateOperation::toXml();
-
+
CopyOperation *const me = const_cast<CopyOperation *>(this);
-
+
const QVariant v = value(QLatin1String("backupOfExistingDestination"));
me->clearValue(QLatin1String("backupOfExistingDestination"));
const QDomDocument xml = UpdateOperation::toXml();
@@ -225,8 +225,8 @@ void MoveOperation::backup()
setValue(QLatin1String("backupOfExistingDestination"), backupFileName(dest));
- // race condition: The backup file could get created
- // by another process right now. But this is the same
+ // race condition: The backup file could get created
+ // by another process right now. But this is the same
// in QFile::copy...
const bool success = QFile::rename(dest, value(QLatin1String("backupOfExistingDestination")).toString());
if (!success)
@@ -389,9 +389,9 @@ QDomDocument DeleteOperation::toXml() const
// we don't want to save the backupOfExistingFile
if (!hasValue(QLatin1String("backupOfExistingFile")))
return UpdateOperation::toXml();
-
+
DeleteOperation *const me = const_cast<DeleteOperation *>(this);
-
+
const QVariant v = value(QLatin1String("backupOfExistingFile"));
me->clearValue(QLatin1String("backupOfExistingFile"));
const QDomDocument xml = UpdateOperation::toXml();
@@ -847,7 +847,7 @@ bool ExecuteOperation::performOperation()
}
QList<int> allowedExitCodes;
-
+
QRegExp re(QLatin1String("^\\{((-?\\d+,)*-?\\d+)\\}$"));
if (re.exactMatch(args.first())) {
const QStringList numbers = re.cap(1).split(QLatin1Char(','));
@@ -865,7 +865,7 @@ bool ExecuteOperation::performOperation()
args.pop_back();
#ifdef Q_OS_WIN
QString arguments = qt_create_commandline(args.front(), args.mid(1));
-
+
PROCESS_INFORMATION pinfo;
STARTUPINFOW startupInfo = { sizeof(STARTUPINFO), 0, 0, 0,
@@ -873,7 +873,8 @@ bool ExecuteOperation::performOperation()
static_cast< ulong >(CW_USEDEFAULT), static_cast< ulong >(CW_USEDEFAULT),
0, 0, 0, STARTF_USESHOWWINDOW, SW_HIDE, 0, 0, 0, 0, 0
};
- success = CreateProcess(0, const_cast< wchar_t* >(static_cast< const wchar_t* >(arguments.utf16())),
+ // PQR for MinGW-w64: Parameter #2 was const_cast< wchar_t* >(static_cast< const wchar_t* >(arguments.utf16())).
+ success = CreateProcess(0, (LPWSTR)arguments.utf16(),
0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0,
0,
&startupInfo, &pinfo);
@@ -887,7 +888,7 @@ bool ExecuteOperation::performOperation()
{
Environment::instance().applyTo(&process); //apply non-persistent variables
process.start(args.front(), args.mid(1));
-
+
QEventLoop loop;
QObject::connect(&process, SIGNAL(finished(int, QProcess::ExitStatus)), &loop, SLOT(quit()));
QObject::connect(&process, SIGNAL(readyRead()), this, SLOT(readProcessOutput()));