fix build of gui component for windows

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/accessible/accessible.cmake b/src/gui/accessible/accessible.cmake
index 17d80b9..f32131d 100644 (file)
--- a/src/gui/accessible/accessible.cmake
+++ b/src/gui/accessible/accessible.cmake
@@ -45,5 +45,5 @@ if(WITH_ACCESSIBILITY)
     endif()
 else()
     # FIXME: move to global scope
-    add_definitions(-DQT_NO_ACCESSIBILITY)
+    katie_definition(-DQT_NO_ACCESSIBILITY)
 endif()
\ No newline at end of file

diff --git a/src/gui/dialogs/qprintdialog_win.cpp b/src/gui/dialogs/qprintdialog_win.cpp
index 5c52011..adfba20 100644 (file)
--- a/src/gui/dialogs/qprintdialog_win.cpp
+++ b/src/gui/dialogs/qprintdialog_win.cpp
@@ -313,6 +313,8 @@ void QPrintDialog::setVisible(bool visible)
 
 QT_END_NAMESPACE
 
-
+#include "moc_qprintdialog.h"
+#include "moc_qprintdialog_win.cpp"
+#include "qrc_qprintdialog.cpp"
 
 #endif // QT_NO_PRINTDIALOG

diff --git a/src/gui/inputmethod/inputmethod.cmake b/src/gui/inputmethod/inputmethod.cmake
index c08ce4a..a14abb2 100644 (file)
--- a/src/gui/inputmethod/inputmethod.cmake
+++ b/src/gui/inputmethod/inputmethod.cmake
@@ -31,6 +31,10 @@ elseif(KATIE_PLATFORM STREQUAL "win32")
         ${GUI_SOURCES}
         ${CMAKE_CURRENT_SOURCE_DIR}/inputmethod/qwininputcontext_win.cpp
     )
+    set(EXTRA_GUI_LIBS
+        ${EXTRA_GUI_LIBS}
+        imm32
+    )
 elseif(KATIE_PLATFORM STREQUAL "qws")
     set(GUI_HEADERS
         ${GUI_HEADERS}

diff --git a/src/gui/inputmethod/qwininputcontext_win.cpp b/src/gui/inputmethod/qwininputcontext_win.cpp
index 2fdf7fd..a00e7e4 100644 (file)
--- a/src/gui/inputmethod/qwininputcontext_win.cpp
+++ b/src/gui/inputmethod/qwininputcontext_win.cpp
@@ -846,4 +846,7 @@ int QWinInputContext::reconvertString(RECONVERTSTRING *reconv)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qwininputcontext_p.h"
+
 #endif // QT_NO_IM

diff --git a/src/gui/inputmethod/qximinputcontext_x11.cpp b/src/gui/inputmethod/qximinputcontext_x11.cpp
index a3dfabc..34a21b7 100644 (file)
--- a/src/gui/inputmethod/qximinputcontext_x11.cpp
+++ b/src/gui/inputmethod/qximinputcontext_x11.cpp
@@ -882,7 +882,6 @@ bool QXIMInputContext::x11FilterEvent(QWidget *, XEvent *) { return true; }
 
 QT_END_NAMESPACE
 
-
 #include "moc_qximinputcontext_p.h"
 
 #endif //QT_NO_IM

diff --git a/src/gui/kernel/kernel.cmake b/src/gui/kernel/kernel.cmake
index 6d65f07..5f8e3ab 100644 (file)
--- a/src/gui/kernel/kernel.cmake
+++ b/src/gui/kernel/kernel.cmake
@@ -162,6 +162,10 @@ elseif(KATIE_PLATFORM STREQUAL "win32")
     )
     add_definitions(-DQT_NO_DIRECTDRAW)
     include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/wintab)
+    set(EXTRA_GUI_LIBS
+        ${EXTRA_GUI_LIBS}
+        winmm
+    )
 elseif(KATIE_PLATFORM STREQUAL "wince")
     set(GUI_HEADERS
         ${GUI_HEADERS}

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 16df33e..131828b 100644 (file)
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -4279,4 +4279,6 @@ bool QApplicationPrivate::translateTouchEvent(const MSG &msg)
     return true;
 }
 
+#include "moc_qsessionmanager.h"
+
 QT_END_NAMESPACE