Changes: Windows build fixes.

RevBy: Stanislav Ionascu
Merge-Request: 1168

8 files changed, 12 insertions, 2 deletions

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index cecb4641..5cea88dd 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -4,6 +4,8 @@ TARGET = meegotouchcore
 
 DEFINES += M_BUILD_CORE
 
+INCLUDEPATH += .
+
 include(animation/animation.pri)
 include(core/core.pri)
 include(effects/effects.pri)
diff --git a/src/corelib/widgets/mpannableviewport.cpp b/src/corelib/widgets/mpannableviewport.cpp
index b4ba91d3..1616f1b7 100644
--- a/src/corelib/widgets/mpannableviewport.cpp
+++ b/src/corelib/widgets/mpannableviewport.cpp
@@ -475,7 +475,7 @@ void MPannableViewport::updateData(const QList<const char *> &modifications)
     foreach(member, modifications) {
         if (member == MPannableWidgetModel::VerticalPanningPolicy) {
             if (verticalPanningPolicy() == PanningAlwaysOff) {
-                d->viewportLayout->setPanningDirections( d->viewportLayout->panningDirections() & !Qt::Vertical);
+                d->viewportLayout->setPanningDirections( d->viewportLayout->panningDirections() & ~Qt::Vertical);
             } else {
                 d->viewportLayout->setPanningDirections( d->viewportLayout->panningDirections() | Qt::Vertical);
             }
@@ -483,7 +483,7 @@ void MPannableViewport::updateData(const QList<const char *> &modifications)
 
         if (member == MPannableWidgetModel::HorizontalPanningPolicy) {
             if (horizontalPanningPolicy() == PanningAlwaysOff) {
-                d->viewportLayout->setPanningDirections( d->viewportLayout->panningDirections() & !Qt::Horizontal);
+                d->viewportLayout->setPanningDirections( d->viewportLayout->panningDirections() & ~Qt::Horizontal);
             } else {
                 d->viewportLayout->setPanningDirections( d->viewportLayout->panningDirections() | Qt::Horizontal);
             }
diff --git a/src/settings/settingslanguage/msettingslanguagebooleanfactory.cpp b/src/settings/settingslanguage/msettingslanguagebooleanfactory.cpp
index 2ca43208..34e254e9 100644
--- a/src/settings/settingslanguage/msettingslanguagebooleanfactory.cpp
+++ b/src/settings/settingslanguage/msettingslanguagebooleanfactory.cpp
@@ -20,6 +20,7 @@
 #include "msettingslanguagebooleanfactory.h"
 #include "msettingslanguagebooleancontroller.h"
 #include "msettingslanguageboolean.h"
+#include "msettingslanguagewidget.h"
 
 #include <MWidgetView>
 #include <MLayout>
diff --git a/src/settings/settingslanguage/msettingslanguageintegerfactory.cpp b/src/settings/settingslanguage/msettingslanguageintegerfactory.cpp
index 0b86d7d6..22af868f 100644
--- a/src/settings/settingslanguage/msettingslanguageintegerfactory.cpp
+++ b/src/settings/settingslanguage/msettingslanguageintegerfactory.cpp
@@ -20,6 +20,7 @@
 #include "msettingslanguageinteger.h"
 #include "msettingslanguageintegerfactory.h"
 #include "msettingslanguageintegercontroller.h"
+#include "msettingslanguagewidget.h"
 
 #include <MWidgetView>
 #include <MLabel>
diff --git a/src/settings/settingslanguage/msettingslanguageselectionfactory.cpp b/src/settings/settingslanguage/msettingslanguageselectionfactory.cpp
index 89bd2e3f..2f9b15fa 100644
--- a/src/settings/settingslanguage/msettingslanguageselectionfactory.cpp
+++ b/src/settings/settingslanguage/msettingslanguageselectionfactory.cpp
@@ -21,6 +21,7 @@
 #include "msettingslanguageselectioncontroller.h"
 #include "msettingslanguageselection.h"
 #include "msettingslanguageoption.h"
+#include "msettingslanguagewidget.h"
 
 #include <MWidgetView>
 #include <MLayout>
diff --git a/src/settings/settingslanguage/msettingslanguagetextfactory.cpp b/src/settings/settingslanguage/msettingslanguagetextfactory.cpp
index 85531cbc..8612c7b0 100644
--- a/src/settings/settingslanguage/msettingslanguagetextfactory.cpp
+++ b/src/settings/settingslanguage/msettingslanguagetextfactory.cpp
@@ -21,6 +21,7 @@
 #include "msettingslanguagetextcontroller.h"
 #include "msettingslanguagebinary.h"
 #include "msettingslanguagetext.h"
+#include "msettingslanguagewidget.h"
 
 #include <MWidgetView>
 #include <MLabel>
diff --git a/src/settings/settingslanguage/settingslanguage.pri b/src/settings/settingslanguage/settingslanguage.pri
index 852e6ecb..1523957c 100644
--- a/src/settings/settingslanguage/settingslanguage.pri
+++ b/src/settings/settingslanguage/settingslanguage.pri
@@ -1,3 +1,5 @@
+INCLUDEPATH += .
+
 STYLE_HEADERS += \
     settingslanguage/msettingslanguagesettingsfactorystyle.h
 
diff --git a/src/views/views.pri b/src/views/views.pri
index 587aa556..9ee78840 100644
--- a/src/views/views.pri
+++ b/src/views/views.pri
@@ -3,6 +3,8 @@
 # This module contains all classes implemeting widget views.
 ###############################################################################
 
+INCLUDEPATH += .
+
 PUBLIC_HEADERS += \
     mapplicationpageview.h \
     mcomboboxview.h \