From aecd41c070aa12863e7977465cba44d7ae334e65 Mon Sep 17 00:00:00 2001 From: Olli Werwolff Date: Wed, 8 Jun 2011 11:46:12 +0200 Subject: Do not compile _win files when -qpa is used Reviewed-by: Samuel Reviewed-by: Lars Knoll --- src/widgets/accessible/accessible.pri | 2 +- src/widgets/inputmethod/inputmethod.pri | 2 +- src/widgets/kernel/kernel.pri | 4 ++-- src/widgets/util/util.pri | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/widgets') 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 } -- cgit v1.2.3