diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-13 09:01:43 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-29 18:31:35 +0000 |
| commit | 9f27bfb31acfba49a74a342d9249f24633a7ade2 (patch) | |
| tree | b156192def25d688ff924b60f1c8defadd86c351 /examples/widgets | |
| parent | dd8e73504edbf71808d6585b7a08daddcdcbf18e (diff) | |
Make sure we can build with -no-feature-draganddrop
We move QInternalMimeData to a separate file, because this class is
used, even if draganddrop is disabled. From now on, include
qinternalmimedata_p.h instead of qdnd_p.h for QInternalMimeData.
Change-Id: I594e08e2e90d574dc445119091686b4b69e4731b
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/graphicsview/graphicsview.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/itemviews/itemviews.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/widgets.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro index 5a054fe6b2..b9bef70a0e 100644 --- a/examples/widgets/graphicsview/graphicsview.pro +++ b/examples/widgets/graphicsview/graphicsview.pro @@ -13,7 +13,7 @@ SUBDIRS = \ simpleanchorlayout \ weatheranchorlayout -contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot +contains(DEFINES, QT_NO_CURSOR)|!qtConfig(draganddrop): SUBDIRS -= dragdroprobot qtHaveModule(opengl):!qtConfig(opengles.):!qtConfig(dynamicgl) { SUBDIRS += boxes diff --git a/examples/widgets/itemviews/itemviews.pro b/examples/widgets/itemviews/itemviews.pro index 75307bd74e..b4a002c156 100644 --- a/examples/widgets/itemviews/itemviews.pro +++ b/examples/widgets/itemviews/itemviews.pro @@ -20,5 +20,5 @@ SUBDIRS = addressbook \ spreadsheet \ stardelegate \ storageview -contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= puzzle +!qtConfig(draganddrop): SUBDIRS -= puzzle !qtHaveModule(xml): SUBDIRS -= simpledommodel diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index cef4936d32..f9d863b69e 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -26,5 +26,5 @@ qtHaveModule(gui):qtConfig(opengl): \ SUBDIRS += windowcontainer contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows -contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= draganddrop +!qtConfig(draganddrop): SUBDIRS -= draganddrop mac:SUBDIRS += mac |