diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-19 13:25:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-19 16:12:34 +0200 |
| commit | ce09ef431373f45d14ce0a6e7de24aee3666093d (patch) | |
| tree | 7c998b21f02db55e233e7eeb1599663f1c6b51ca /src/platformsupport/linuxaccessibility/linuxaccessibility.pro | |
| parent | 7ad55ca65f42351e231f31f7a9253ae6eaf1ebb3 (diff) | |
| parent | 97eec16e4ff6367c233f8ea6c4a343c286c3a514 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/windows/qwindowscontext.cpp
src/plugins/platforms/windows/windows.pri
src/tools/uic/cpp/cppwriteinitialization.cpp
src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
Diffstat (limited to 'src/platformsupport/linuxaccessibility/linuxaccessibility.pro')
| -rw-r--r-- | src/platformsupport/linuxaccessibility/linuxaccessibility.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pro b/src/platformsupport/linuxaccessibility/linuxaccessibility.pro index 6d68909047..d6689c0fa3 100644 --- a/src/platformsupport/linuxaccessibility/linuxaccessibility.pro +++ b/src/platformsupport/linuxaccessibility/linuxaccessibility.pro @@ -7,7 +7,13 @@ CONFIG += static internal_module DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h -include(../../3rdparty/atspi2/atspi2.pri) +DBUS_ADAPTORS = $$PWD/dbusxml/Cache.xml $$PWD/dbusxml/DeviceEventController.xml +QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i struct_marshallers_p.h + +DBUS_INTERFACES = $$PWD/dbusxml/Socket.xml $$PWD/dbusxml/Bus.xml +QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i struct_marshallers_p.h + +QMAKE_USE += atspi/nolink HEADERS += \ application_p.h \ |