diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-10-08 10:11:32 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 10:52:05 (GMT) |
| commit | c757e2d46ed0ab6ff3611752c2126dafdae4a04c (patch) | |
| tree | 72875ba8097e0fe9a04adf8cb0f9087df8784882 | |
| parent | 4c80a588825f55c3b8f10a90d692b3295b31c941 (diff) | |
| download | Qt-c757e2d46ed0ab6ff3611752c2126dafdae4a04c.zip Qt-c757e2d46ed0ab6ff3611752c2126dafdae4a04c.tar.gz Qt-c757e2d46ed0ab6ff3611752c2126dafdae4a04c.tar.bz2 | |
Fix compile errors on mingw (The version supplied with Qt 4.5)
Added the missing defines
Reviewed-by: Denis
(cherry picked from commit 1040ba2fd850196234424f769e28d513a6eb0948)
| -rw-r--r-- | src/gui/dialogs/qprintdialog_win.cpp | 7 | ||||
| -rw-r--r-- | src/gui/inputmethod/qwininputcontext_p.h | 13 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 5 | ||||
| -rw-r--r-- | src/gui/util/qdesktopservices_win.cpp | 5 |
4 files changed, 29 insertions, 1 deletions
diff --git a/src/gui/dialogs/qprintdialog_win.cpp b/src/gui/dialogs/qprintdialog_win.cpp index f66c27f..843c4e2 100644 --- a/src/gui/dialogs/qprintdialog_win.cpp +++ b/src/gui/dialogs/qprintdialog_win.cpp @@ -52,6 +52,13 @@ #include <private/qprintengine_win_p.h> #include <private/qprinter_p.h> +#if defined(Q_CC_MINGW) && !defined(PD_NOCURRENTPAGE) +#define PD_NOCURRENTPAGE 0x00800000 +#define PD_RESULT_PRINT 1 +#define PD_RESULT_APPLY 2 +#define START_PAGE_GENERAL 0XFFFFFFFF +#endif + QT_BEGIN_NAMESPACE extern void qt_win_eatMouseMove(); diff --git a/src/gui/inputmethod/qwininputcontext_p.h b/src/gui/inputmethod/qwininputcontext_p.h index 39d50fd..dd0490d 100644 --- a/src/gui/inputmethod/qwininputcontext_p.h +++ b/src/gui/inputmethod/qwininputcontext_p.h @@ -56,6 +56,19 @@ #include "QtGui/qinputcontext.h" #include "QtCore/qt_windows.h" +#if defined(Q_CC_MINGW) && !defined(IMR_RECONVERTSTRING) +typedef struct tagRECONVERTSTRING { + DWORD dwSize; + DWORD dwVersion; + DWORD dwStrLen; + DWORD dwStrOffset; + DWORD dwCompStrLen; + DWORD dwCompStrOffset; + DWORD dwTargetStrLen; + DWORD dwTargetStrOffset; +} RECONVERTSTRING, *PRECONVERTSTRING; +#endif + QT_BEGIN_NAMESPACE class QWinInputContext : public QInputContext diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 44f82b6..270562f 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -171,10 +171,13 @@ typedef struct tagTOUCHINPUT #include <mywinsock.h> #endif +#ifndef IMR_RECONVERTSTRING +#define IMR_RECONVERTSTRING 4 +#endif + #ifndef IMR_CONFIRMRECONVERTSTRING #define IMR_CONFIRMRECONVERTSTRING 0x0005 #endif - QT_BEGIN_NAMESPACE #ifdef Q_WS_WINCE diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp index 9ae3a15..c1ab5b8 100644 --- a/src/gui/util/qdesktopservices_win.cpp +++ b/src/gui/util/qdesktopservices_win.cpp @@ -58,6 +58,11 @@ # endif #endif +#if defined(Q_CC_MINGW) && !defined(CSIDL_MYMUSIC) +#define CSIDL_MYMUSIC 13 +#define CSIDL_MYVIDEO 14 +#endif + #ifndef QT_NO_DESKTOPSERVICES QT_BEGIN_NAMESPACE |