summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorOlli Werwolff <qt-info@nokia.com>2011-06-08 11:46:12 +0200
committerOlli Werwolff <qt-info@nokia.com>2011-06-08 13:57:27 +0200
commitaecd41c070aa12863e7977465cba44d7ae334e65 (patch)
tree12892e553d81ae097c2acce5a8a1e65487cb3744 /src/widgets
parenta844e2360796bd4cd164c2b8730f364dcf1381bf (diff)
Do not compile _win files when -qpa is used
Reviewed-by: Samuel Reviewed-by: Lars Knoll
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/accessible/accessible.pri2
-rw-r--r--src/widgets/inputmethod/inputmethod.pri2
-rw-r--r--src/widgets/kernel/kernel.pri4
-rw-r--r--src/widgets/util/util.pri2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/accessible/accessible.pri b/src/widgets/accessible/accessible.pri
index 66a84bcce6..ff75563eed 100644
--- a/src/widgets/accessible/accessible.pri
+++ b/src/widgets/accessible/accessible.pri
@@ -16,7 +16,7 @@ contains(QT_CONFIG, accessibility) {
HEADERS += accessible/qaccessible_mac_p.h
OBJECTIVE_SOURCES += accessible/qaccessible_mac.mm \
accessible/qaccessible_mac_cocoa.mm
- } else:win32 {
+ } else:win32:!qpa {
SOURCES += accessible/qaccessible_win.cpp
} else {
HEADERS += accessible/qaccessiblebridge.h
diff --git a/src/widgets/inputmethod/inputmethod.pri b/src/widgets/inputmethod/inputmethod.pri
index 77ca3bd057..87eb17ce20 100644
--- a/src/widgets/inputmethod/inputmethod.pri
+++ b/src/widgets/inputmethod/inputmethod.pri
@@ -11,7 +11,7 @@ x11 {
HEADERS += inputmethod/qximinputcontext_p.h
SOURCES += inputmethod/qximinputcontext_x11.cpp
}
-win32 {
+win32:!qpa {
HEADERS += inputmethod/qwininputcontext_p.h
SOURCES += inputmethod/qwininputcontext_win.cpp
}
diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index d085bff146..6be316bae9 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -71,9 +71,9 @@ SOURCES += \
kernel/qguiplatformplugin.cpp \
kernel/qwidgetsvariant.cpp
-win32 {
- DEFINES += QT_NO_DIRECTDRAW
+win32: DEFINES += QT_NO_DIRECTDRAW
+win32:!qpa {
HEADERS += \
kernel/qwinnativepangesturerecognizer_win_p.h
diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri
index 854964b784..1ba8011ee3 100644
--- a/src/widgets/util/util.pri
+++ b/src/widgets/util/util.pri
@@ -29,7 +29,7 @@ SOURCES += \
wince* {
SOURCES += \
util/qsystemtrayicon_wince.cpp
-} else:win32 {
+} else:win32:!qpa {
SOURCES += \
util/qsystemtrayicon_win.cpp
}