summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@digia.com>2014-03-21 08:23:49 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-21 23:13:23 +0100
commit0afe3c7ee3fcaeac68c232a3f2469b1e4c35f6a5 (patch)
tree44a9e23f2e633fd740670ed262ab51edc18b0f69
parent2c26f9a39f6b4102845f50d8bdfc01593446629a (diff)
Windows Phone: Remove QT_NO_CURSORv5.3.0-beta1
This define causes source incompatibilities in QML applications, as it results in removal of properties from e.g. MouseArea. The default (null) cursor implementation which will now be active should cause negligible overhead with this define removed. Change-Id: I8ee78e084cb95b4c73782a3a831f0672ba230b19 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
-rw-r--r--mkspecs/winphone-arm-msvc2012/qmake.conf2
-rw-r--r--mkspecs/winphone-x86-msvc2012/qmake.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/winphone-arm-msvc2012/qmake.conf b/mkspecs/winphone-arm-msvc2012/qmake.conf
index b5bd2ee7ef..72961c320d 100644
--- a/mkspecs/winphone-arm-msvc2012/qmake.conf
+++ b/mkspecs/winphone-arm-msvc2012/qmake.conf
@@ -7,7 +7,7 @@
include(../common/winrt_winphone/qmake.conf)
QMAKE_COMPILER_DEFINES += _MSC_VER=1700
QMAKE_PLATFORM = winphone $$QMAKE_PLATFORM
-DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP ARM __ARM__ __arm__ QT_NO_CURSOR
+DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP ARM __ARM__ __arm__
QMAKE_LFLAGS += /MACHINE:ARM
diff --git a/mkspecs/winphone-x86-msvc2012/qmake.conf b/mkspecs/winphone-x86-msvc2012/qmake.conf
index 1e0af90f0e..f7838d187a 100644
--- a/mkspecs/winphone-x86-msvc2012/qmake.conf
+++ b/mkspecs/winphone-x86-msvc2012/qmake.conf
@@ -7,7 +7,7 @@
include(../common/winrt_winphone/qmake.conf)
QMAKE_COMPILER_DEFINES += _MSC_VER=1700
QMAKE_PLATFORM = winphone $$QMAKE_PLATFORM
-DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP X86 __X86__ __x86__ QT_NO_CURSOR
+DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP X86 __X86__ __x86__
QMAKE_LFLAGS += /MACHINE:X86