Commit 1f13482f authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Yet another compile fix for MinGW/Windows.

Change-Id: Iea0d998de254d26e15a8703812b3aad8399721a8
Reviewed-on: http://codereview.qt.nokia.com/2777

Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent be40d9ca
...@@ -45,9 +45,10 @@ namespace Utils { ...@@ -45,9 +45,10 @@ namespace Utils {
ConsoleProcessPrivate::ConsoleProcessPrivate() : ConsoleProcessPrivate::ConsoleProcessPrivate() :
m_mode(ConsoleProcess::Run), m_mode(ConsoleProcess::Run),
m_appPid(0),m_appMainThreadId(0), m_appPid(0),
m_stubSocket(0), m_stubSocket(0),
m_tempFile(0), m_tempFile(0),
m_appMainThreadId(0),
m_pid(0), m_pid(0),
m_hInferior(NULL), m_hInferior(NULL),
inferiorFinishedNotifier(0), inferiorFinishedNotifier(0),
......
...@@ -690,7 +690,7 @@ BOOL CALLBACK sendShutDownMessageToAllWindowsOfProcess_enumWnd(HWND hwnd, LPARAM ...@@ -690,7 +690,7 @@ BOOL CALLBACK sendShutDownMessageToAllWindowsOfProcess_enumWnd(HWND hwnd, LPARAM
static UINT uiShutDownMessage = RegisterWindowMessage(L"qtcbuildhelper_shutdown"); static UINT uiShutDownMessage = RegisterWindowMessage(L"qtcbuildhelper_shutdown");
DWORD dwProcessID; DWORD dwProcessID;
GetWindowThreadProcessId(hwnd, &dwProcessID); GetWindowThreadProcessId(hwnd, &dwProcessID);
if (lParam == dwProcessID) { if ((DWORD)lParam == dwProcessID) {
SendNotifyMessage(hwnd, uiShutDownMessage, 0, 0); SendNotifyMessage(hwnd, uiShutDownMessage, 0, 0);
return FALSE; return FALSE;
} }
......
...@@ -15,4 +15,4 @@ HEADERS += \ ...@@ -15,4 +15,4 @@ HEADERS += \
SOURCES += \ SOURCES += \
proxyaction.cpp proxyaction.cpp
win32: LIBS += user32.lib win32: LIBS += -lUser32
...@@ -151,7 +151,7 @@ int make_depend(QCoreApplication *app) ...@@ -151,7 +151,7 @@ int make_depend(QCoreApplication *app)
todo.removeFirst(); todo.removeFirst();
if (todo.isEmpty()) if (todo.isEmpty())
todo.append(qgetenv("QTDIR") + "/include/QtCore/QtCore"); todo.append(QString::fromLocal8Bit(qgetenv("QTDIR")) + QLatin1String("/include/QtCore/QtCore"));
QMap<QString, QStringList> processed; QMap<QString, QStringList> processed;
...@@ -170,8 +170,7 @@ int make_depend(QCoreApplication *app) ...@@ -170,8 +170,7 @@ int make_depend(QCoreApplication *app)
Environment env; Environment env;
MakeDepend client(&env); MakeDepend client(&env);
client.addSystemDir(qgetenv("QTDIR") + "/include"); client.addSystemDir(QString::fromLocal8Bit(qgetenv("QTDIR")) + QLatin1String("/include"));
Preprocessor preproc(&client, &env); Preprocessor preproc(&client, &env);
preproc.preprocess(fn, code, /*result = */ 0); preproc.preprocess(fn, code, /*result = */ 0);
deps = client.includedFiles(); deps = client.includedFiles();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment