From f7bfcdfa288b4d85adc5649fd7e4f97d42357e7f Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Mon, 9 Jan 2012 16:59:54 +1000 Subject: [PATCH] Remove widgets config test. Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe --- config.tests/widgets/main.cpp | 48 ------------------------ config.tests/widgets/widgets.pro | 5 --- examples/examples.pro | 2 +- src/plugins/directshow/camera/camera.pri | 2 +- src/plugins/directshow/directshow.pro | 2 +- src/plugins/directshow/player/player.pri | 2 +- src/plugins/gstreamer/gstreamer.pro | 6 +-- src/plugins/plugins.pro | 2 +- src/plugins/qt7/qt7.pro | 6 +-- src/plugins/wmf/player/player.pri | 2 +- src/plugins/wmf/wmf.pro | 2 +- src/src.pro | 2 +- sync.profile | 3 -- tests/auto/unit/unit.pro | 2 +- 14 files changed, 15 insertions(+), 71 deletions(-) delete mode 100644 config.tests/widgets/main.cpp delete mode 100644 config.tests/widgets/widgets.pro diff --git a/config.tests/widgets/main.cpp b/config.tests/widgets/main.cpp deleted file mode 100644 index 20a7c56e..00000000 --- a/config.tests/widgets/main.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -int main(int, char**) -{ - QMainWindow m; - return 0; -} diff --git a/config.tests/widgets/widgets.pro b/config.tests/widgets/widgets.pro deleted file mode 100644 index b7ae2d95..00000000 --- a/config.tests/widgets/widgets.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = app -QT += gui widgets - -# Input -SOURCES += main.cpp diff --git a/examples/examples.pro b/examples/examples.pro index ef1cc114..9d9442e7 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs # These examples all need widgets for now (using creator templates that use widgets) -contains(config_test_widgets, yes) { +!isEmpty(QT.widgets.name) { SUBDIRS += \ radio \ camera \ diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index 3067497b..9acd5e54 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -24,7 +24,7 @@ SOURCES += \ $$PWD/dsimagecapturecontrol.cpp \ $$PWD/dscamerasession.cpp -contains(config_test_widgets, yes) { +!isEmpty(QT.widgets.name) { HEADERS += $$PWD/dsvideowidgetcontrol.h SOURCES += $$PWD/dsvideowidgetcontrol.cpp } diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index e027a2c7..bb5bb023 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -14,7 +14,7 @@ SOURCES += dsserviceplugin.cpp !contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK -contains(config_test_widgets, yes) { +!isEmpty(QT.widgets.name) { QT += multimediawidgets DEFINES += HAVE_WIDGETS } diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri index c30b2836..3a3048ac 100644 --- a/src/plugins/directshow/player/player.pri +++ b/src/plugins/directshow/player/player.pri @@ -35,7 +35,7 @@ SOURCES += \ $$PWD/mediasamplevideobuffer.cpp \ $$PWD/videosurfacefilter.cpp -contains(config_test_widgets, yes):!simulator { +!isEmpty(QT.widgets.name):!simulator { HEADERS += \ $$PWD/vmr9videowindowcontrol.h diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index 137b61c5..6f4d43b9 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/src/plugins/gstreamer/gstreamer.pro @@ -5,7 +5,7 @@ TARGET = qgstengine QT += multimedia-private network CONFIG += no_private_qt_headers_warning -contains(config_test_widgets, yes) { +!isEmpty(QT.widgets.name) { QT += widgets multimediawidgets-private DEFINES += HAVE_WIDGETS } @@ -46,7 +46,7 @@ maemo6 { PKGCONFIG += qmsystem2 - isEqual(QT_ARCH,armv6):contains(config_test_widgets, yes) { + isEqual(QT_ARCH,armv6):!isEmpty(QT.widgets.name) { HEADERS += qgstreamergltexturerenderer.h SOURCES += qgstreamergltexturerenderer.cpp QT += opengl @@ -74,7 +74,7 @@ SOURCES += \ gstvideoconnector.c \ -contains(config_test_xvideo, yes):contains(config_test_widgets, yes): { +contains(config_test_xvideo, yes):!isEmpty(QT.widgets.name): { DEFINES += HAVE_XVIDEO LIBS += -lXv -lX11 -lXext diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 0317d7d1..ac5968a3 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -39,6 +39,6 @@ mac:!simulator { # Currently we need qmacdefines_mac.h from QtWidgets, so this depends on that :/ # despite the code not really using them. - contains(config_test_widgets, yes):SUBDIRS += qt7 + !isEmpty(QT.widgets.name):SUBDIRS += qt7 } diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index 32f6d218..c17205c4 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -2,7 +2,7 @@ load(qt_module) TARGET = qqt7engine QT += multimedia-private network -contains(config_test_widgets, yes) { +!isEmpty(QT.widgets.name) { QT += multimediawidgets-private widgets } @@ -56,9 +56,9 @@ OBJECTIVE_SOURCES += \ qt7ciimagevideobuffer.mm \ qcvdisplaylink.mm - contains(config_test_widgets, yes) { + !isEmpty(QT.widgets.name) { HEADERS += \ - qt7movieviewwidget.h + qt7movievideowidget.h OBJECTIVE_SOURCES += \ qt7movievideowidget.mm diff --git a/src/plugins/wmf/player/player.pri b/src/plugins/wmf/player/player.pri index 07142130..57cca77e 100644 --- a/src/plugins/wmf/player/player.pri +++ b/src/plugins/wmf/player/player.pri @@ -24,7 +24,7 @@ SOURCES += \ $$PWD/mfaudioendpointcontrol.cpp \ $$PWD/mfmetadatacontrol.cpp -contains(config_test_widgets, yes):!simulator { +!isEmpty(QT.widgets.name):!simulator { HEADERS += $$PWD/evr9videowindowcontrol.h SOURCES += $$PWD/evr9videowindowcontrol.cpp } diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index 7c2e0abe..38c08880 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -2,7 +2,7 @@ load(qt_module) TARGET = wmfengine QT += multimedia-private network -contains(config_test_widgets, yes) { +!isEmpty(QT.widgets.name) { QT += multimediawidgets-private DEFINES += HAVE_WIDGETS } diff --git a/src/src.pro b/src/src.pro index 14b6c707..aea0f58e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -19,7 +19,7 @@ SUBDIRS += src_imports # Optional bits contains(config_test_gstreamer, yes):SUBDIRS += src_qgsttools -contains(config_test_widgets, yes) { +!isEmpty(QT.widgets.name) { SUBDIRS += src_qtmmwidgets # If widgets is around, plugins depends on widgets too (imports does not) diff --git a/sync.profile b/sync.profile index 58c567ca..31fff9e3 100644 --- a/sync.profile +++ b/sync.profile @@ -37,9 +37,6 @@ ); # Compile tests %configtests = ( - # Widgets (to make things easier) - "widgets" => {message => "Disabling widget related code. To enable, make sure that QtWidgets exists."}, - # Windows tests "directshow" => {}, "wmsdk" => {}, diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro index d9e49697..a79f7fa4 100644 --- a/tests/auto/unit/unit.pro +++ b/tests/auto/unit/unit.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS += multimedia.pro -contains(config_test_widgets, yes): SUBDIRS += multimediawidgets.pro +!isEmpty(QT.widgets.name): SUBDIRS += multimediawidgets.pro