diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-21 05:20:03 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-21 05:20:03 (GMT) |
| commit | 8079a0c5b4ee6550501476410fab457d63c705b6 (patch) | |
| tree | 6d7bb6335ebe494546296911b1ff1239335212b9 /src/activeqt/control/qaxservermain.cpp | |
| parent | 5a3db7268eb9203e91fc09e5db6d8690274464d7 (diff) | |
| parent | 6ca14dce65634e202b36499c76c268c87f78ceb6 (diff) | |
| download | Qt-8079a0c5b4ee6550501476410fab457d63c705b6.zip Qt-8079a0c5b4ee6550501476410fab457d63c705b6.tar.gz Qt-8079a0c5b4ee6550501476410fab457d63c705b6.tar.bz2 | |
Merge commit 'qt/master' into graphicseffects
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene.h
src/gui/graphicsview/qgraphicsview.cpp
Diffstat (limited to 'src/activeqt/control/qaxservermain.cpp')
| -rw-r--r-- | src/activeqt/control/qaxservermain.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp index 8f20d97..d465746 100644 --- a/src/activeqt/control/qaxservermain.cpp +++ b/src/activeqt/control/qaxservermain.cpp @@ -66,7 +66,7 @@ extern bool qAxActivity; extern HANDLE qAxInstance; extern bool qAxIsServer; extern bool qAxOutProcServer; -extern char qAxModuleFilename[MAX_PATH]; +extern wchar_t qAxModuleFilename[MAX_PATH]; extern QString qAxInit(); extern void qAxCleanup(); extern HRESULT UpdateRegistry(BOOL bRegister); @@ -105,7 +105,7 @@ static DWORD WINAPI MonitorProc(void* pv) static bool StartMonitor() { dwThreadID = GetCurrentThreadId(); - hEventShutdown = CreateEventA(0, false, false, 0); + hEventShutdown = CreateEvent(0, false, false, 0); if (hEventShutdown == 0) return false; DWORD dwThreadID; @@ -203,17 +203,10 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR, QT_USE_NAMESPACE qAxOutProcServer = true; - GetModuleFileNameA(0, qAxModuleFilename, MAX_PATH-1); + GetModuleFileName(0, qAxModuleFilename, MAX_PATH); qAxInstance = hInstance; - QByteArray cmdParam; - QT_WA({ - LPTSTR cmdline = GetCommandLineW(); - cmdParam = QString::fromUtf16((const ushort *)cmdline).toLocal8Bit(); - }, { - cmdParam = GetCommandLineA(); - }); - + QByteArray cmdParam = QString::fromWCharArray(GetCommandLine()).toLocal8Bit(); QList<QByteArray> cmds = cmdParam.split(' '); QByteArray unprocessed; |