summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2012-04-18 11:07:30 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2012-04-19 12:02:40 +0200
commit105dfd158b485985b8014d5b8a71f77928c0c424 (patch)
treea75aec09e7446207934c45c10eefe8d00e82aea7
parent8525ec7a17f68f7b2f4d335da2e620a1ecc1720d (diff)
remove W from windows methods
- there are defines in the windows api which use the correct function (ASCII/Unicode ...) Change-Id: I2c545a67c3d23040bf128ecbc65d7e5015e997b5 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
-rw-r--r--src/libs/installer/adminauthorization_win.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/adminauthorization_win.cpp b/src/libs/installer/adminauthorization_win.cpp
index 7cfd6b3dc..ce6d20a4e 100644
--- a/src/libs/installer/adminauthorization_win.cpp
+++ b/src/libs/installer/adminauthorization_win.cpp
@@ -77,7 +77,7 @@ bool AdminAuthorization::execute(QWidget *, const QString &program, const QStrin
const QString file = QDir::toNativeSeparators(program);
const QString args = QInstaller::createCommandline(QString(), arguments);
- const int len = GetShortPathNameW((wchar_t *)file.utf16(), 0, 0);
+ const int len = GetShortPathName((wchar_t *)file.utf16(), 0, 0);
if (len == 0)
return false;
wchar_t *const buffer = new wchar_t[len];
@@ -96,7 +96,7 @@ bool AdminAuthorization::execute(QWidget *, const QString &program, const QStrin
qDebug() << QString::fromLatin1(" starting elevated process %1 %2 with ::ShellExecuteExW( &TempInfo );"
).arg(program, arguments.join(QLatin1String(" ")));
- const bool result = ::ShellExecuteExW(&TempInfo);
+ const bool result = ::ShellExecuteEx(&TempInfo);
qDebug() << QLatin1String("after starting elevated process");
delete[] buffer;
return result;