diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-21 11:01:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-11 15:15:41 +0100 |
| commit | 8085c96561fa6db305d427d3d65c91f14b8c3ae9 (patch) | |
| tree | c4b5fb928be52d5394c9653eb22bea2c0bbb0639 | |
| parent | 7e0ea26c3d4a8e9f4088f0220462f35abd98816d (diff) | |
| download | qtsvg-8085c96561fa6db305d427d3d65c91f14b8c3ae9.tar.gz | |
make use of qtHaveModule()
Change-Id: Idd8bca1e8e9bb183bc6725b9a9d6a220d609869d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | examples/svg/draganddrop/draganddrop.pro | 2 | ||||
| -rw-r--r-- | examples/svg/embedded/embedded.pro | 2 | ||||
| -rw-r--r-- | examples/svg/network/network.pro | 2 | ||||
| -rw-r--r-- | examples/svg/opengl/opengl.pro | 2 | ||||
| -rw-r--r-- | examples/svg/richtext/richtext.pro | 2 | ||||
| -rw-r--r-- | examples/svg/svg.pro | 4 | ||||
| -rw-r--r-- | examples/svg/svgviewer/svgviewer.pro | 2 | ||||
| -rw-r--r-- | src/plugins/iconengines/iconengines.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | src/svg/svg.pro | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/examples/svg/draganddrop/draganddrop.pro b/examples/svg/draganddrop/draganddrop.pro index 99fecb0..4873316 100644 --- a/examples/svg/draganddrop/draganddrop.pro +++ b/examples/svg/draganddrop/draganddrop.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += delayedencoding +qtHaveModule(widgets): SUBDIRS += delayedencoding QT+=widgets diff --git a/examples/svg/embedded/embedded.pro b/examples/svg/embedded/embedded.pro index 09cbcd2..20c95a0 100644 --- a/examples/svg/embedded/embedded.pro +++ b/examples/svg/embedded/embedded.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo +qtHaveModule(widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo QT+=widgets diff --git a/examples/svg/network/network.pro b/examples/svg/network/network.pro index 6cf6c42..bcf73b5 100644 --- a/examples/svg/network/network.pro +++ b/examples/svg/network/network.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += bearercloud +qtHaveModule(widgets): SUBDIRS += bearercloud QT+=widgets diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro index fd845b6..860860e 100644 --- a/examples/svg/opengl/opengl.pro +++ b/examples/svg/opengl/opengl.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += framebufferobject +qtHaveModule(widgets): SUBDIRS += framebufferobject QT+=widgets diff --git a/examples/svg/richtext/richtext.pro b/examples/svg/richtext/richtext.pro index be9c6c3..e8eeaba 100644 --- a/examples/svg/richtext/richtext.pro +++ b/examples/svg/richtext/richtext.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += textobject +qtHaveModule(widgets): SUBDIRS += textobject QT+=widgets diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro index 979f391..5b3d897 100644 --- a/examples/svg/svg.pro +++ b/examples/svg/svg.pro @@ -1,8 +1,8 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += embeddedsvgviewer svggenerator svgviewer +qtHaveModule(widgets): SUBDIRS += embeddedsvgviewer svggenerator svgviewer SUBDIRS += embedded richtext draganddrop network -contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2):SUBDIRS += opengl +qtHaveModule(opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl QT+=widgets diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro index b163ef7..eb2088c 100644 --- a/examples/svg/svgviewer/svgviewer.pro +++ b/examples/svg/svgviewer/svgviewer.pro @@ -6,7 +6,7 @@ SOURCES = main.cpp \ svgview.cpp QT += widgets svg xml -contains(QT_CONFIG, opengl): QT += opengl +qtHaveModule(opengl): QT += opengl CONFIG += console diff --git a/src/plugins/iconengines/iconengines.pro b/src/plugins/iconengines/iconengines.pro index a3053ec..e7d1871 100644 --- a/src/plugins/iconengines/iconengines.pro +++ b/src/plugins/iconengines/iconengines.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets): SUBDIRS += svgiconengine +qtHaveModule(widgets): SUBDIRS += svgiconengine diff --git a/src/src.pro b/src/src.pro index f023840..a1b5d69 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs CONFIG += ordered -!isEmpty(QT.gui.name): SUBDIRS += svg plugins +qtHaveModule(gui): SUBDIRS += svg plugins diff --git a/src/svg/svg.pro b/src/svg/svg.pro index 0949849..8ee9061 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -1,6 +1,6 @@ TARGET = QtSvg QT = core-private gui-private -!contains(QT_CONFIG, no-widgets): QT += widgets-private +qtHaveModule(widgets): QT += widgets-private DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index db663e6..ab7b1d2 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,5 +1,5 @@ TEMPLATE=subdirs -!contains(QT_CONFIG, no-widgets) { +qtHaveModule(widgets) { SUBDIRS = \ qsvgdevice \ qsvggenerator \ |