feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProject: Fix compilation on cygwin

Browse Source 
Move use of windows API to winutils.
This commit is contained in:
Kai Koehne
2011-01-05 14:44:52 +01:00
parent e624c3fbe6
commit 2c4ae8c1b8
3 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -46,7 +46,7 @@
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#ifdef Q_OS_WIN32
#include <Windows.h>
#include <utils/winutils.h>
#endif
using Core::EditorManager;
@@ -69,7 +69,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent)
{
ctor();
updateQtVersions();
}
}
QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent,
QmlProjectRunConfiguration *source) :
@@ -186,18 +186,14 @@ QString QmlProjectRunConfiguration::canonicalCapsPath(const QString &fileName)
QString canonicalPath = QFileInfo(fileName).canonicalFilePath();
#if defined(Q_OS_WIN32)
wchar_t *buffer = 0;
do {
long length = ::GetLongPathName((wchar_t*)fileName.utf16(), NULL, 0);
if (!length)
break;
buffer = new wchar_t[length];
DWORD rv = ::GetLongPathName((wchar_t*)fileName.utf16(), buffer, length);
if (!rv)
break;
canonicalPath = QString((QChar*)buffer);
} while (false);
delete buffer;
QString error;
// don't know whether the shortpath step is really needed,
// but we do this in QtDeclarative too.
QString path = Utils::getShortPathName(canonicalPath, &error);
if (!path.isEmpty())
path = Utils::getLongPathName(canonicalPath, &error);
if (!path.isEmpty())
canonicalPath = path;
#endif
return canonicalPath;