summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/svg/draganddrop/delayedencoding/images/example.svg2
-rw-r--r--examples/svg/draganddrop/delayedencoding/main.cpp2
-rw-r--r--examples/svg/draganddrop/delayedencoding/mimedata.cpp2
-rw-r--r--examples/svg/draganddrop/delayedencoding/mimedata.h2
-rw-r--r--examples/svg/draganddrop/delayedencoding/sourcewidget.cpp2
-rw-r--r--examples/svg/draganddrop/delayedencoding/sourcewidget.h2
-rw-r--r--examples/svg/draganddrop/draganddrop.pro3
-rw-r--r--examples/svg/embedded/desktopservices/contenttab.cpp2
-rw-r--r--examples/svg/embedded/desktopservices/contenttab.h2
-rw-r--r--examples/svg/embedded/desktopservices/desktopwidget.cpp2
-rw-r--r--examples/svg/embedded/desktopservices/desktopwidget.h2
-rw-r--r--examples/svg/embedded/desktopservices/linktab.cpp2
-rw-r--r--examples/svg/embedded/desktopservices/linktab.h2
-rw-r--r--examples/svg/embedded/desktopservices/main.cpp2
-rw-r--r--examples/svg/embedded/embedded.pro3
-rw-r--r--examples/svg/embedded/fluidlauncher/demoapplication.cpp2
-rw-r--r--examples/svg/embedded/fluidlauncher/demoapplication.h2
-rw-r--r--examples/svg/embedded/fluidlauncher/fluidlauncher.cpp2
-rw-r--r--examples/svg/embedded/fluidlauncher/fluidlauncher.h2
-rw-r--r--examples/svg/embedded/fluidlauncher/main.cpp2
-rw-r--r--examples/svg/embedded/fluidlauncher/pictureflow.cpp2
-rw-r--r--examples/svg/embedded/fluidlauncher/pictureflow.h2
-rw-r--r--examples/svg/embedded/fluidlauncher/slideshow.cpp2
-rw-r--r--examples/svg/embedded/fluidlauncher/slideshow.h2
-rw-r--r--examples/svg/embedded/weatherinfo/weatherinfo.cpp2
-rw-r--r--examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp2
-rw-r--r--examples/svg/embeddedsvgviewer/embeddedsvgviewer.h2
-rw-r--r--examples/svg/embeddedsvgviewer/main.cpp2
-rw-r--r--examples/svg/network/bearercloud/bearercloud.cpp2
-rw-r--r--examples/svg/network/bearercloud/bearercloud.h2
-rw-r--r--examples/svg/network/bearercloud/cloud.cpp2
-rw-r--r--examples/svg/network/bearercloud/cloud.h2
-rw-r--r--examples/svg/network/bearercloud/main.cpp2
-rw-r--r--examples/svg/network/network.pro3
-rw-r--r--examples/svg/opengl/framebufferobject/glwidget.cpp2
-rw-r--r--examples/svg/opengl/framebufferobject/glwidget.h2
-rw-r--r--examples/svg/opengl/framebufferobject/main.cpp2
-rw-r--r--examples/svg/opengl/opengl.pro3
-rw-r--r--examples/svg/richtext/richtext.pro3
-rw-r--r--examples/svg/richtext/textobject/main.cpp2
-rw-r--r--examples/svg/richtext/textobject/svgtextobject.cpp2
-rw-r--r--examples/svg/richtext/textobject/svgtextobject.h2
-rw-r--r--examples/svg/richtext/textobject/window.cpp2
-rw-r--r--examples/svg/richtext/textobject/window.h2
-rw-r--r--examples/svg/svg.pro6
-rw-r--r--examples/svg/svggenerator/displaywidget.cpp2
-rw-r--r--examples/svg/svggenerator/displaywidget.h2
-rw-r--r--examples/svg/svggenerator/doc/src/svggenerator.qdoc4
-rw-r--r--examples/svg/svggenerator/main.cpp2
-rw-r--r--examples/svg/svggenerator/window.cpp2
-rw-r--r--examples/svg/svggenerator/window.h2
-rw-r--r--examples/svg/svgviewer/doc/src/svgviewer.qdoc4
-rw-r--r--examples/svg/svgviewer/main.cpp2
-rw-r--r--examples/svg/svgviewer/mainwindow.cpp2
-rw-r--r--examples/svg/svgviewer/mainwindow.h2
-rw-r--r--examples/svg/svgviewer/svgview.cpp2
-rw-r--r--examples/svg/svgviewer/svgview.h2
-rw-r--r--examples/svg/svgviewer/svgviewer.pro2
58 files changed, 61 insertions, 68 deletions
diff --git a/examples/svg/draganddrop/delayedencoding/images/example.svg b/examples/svg/draganddrop/delayedencoding/images/example.svg
index 89a9129..7ae3ef5 100644
--- a/examples/svg/draganddrop/delayedencoding/images/example.svg
+++ b/examples/svg/draganddrop/delayedencoding/images/example.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" standalone="no"?>
<!-- ***********************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/draganddrop/delayedencoding/main.cpp b/examples/svg/draganddrop/delayedencoding/main.cpp
index 6b6063b..0aed1b2 100644
--- a/examples/svg/draganddrop/delayedencoding/main.cpp
+++ b/examples/svg/draganddrop/delayedencoding/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/draganddrop/delayedencoding/mimedata.cpp b/examples/svg/draganddrop/delayedencoding/mimedata.cpp
index efa096e..080776a 100644
--- a/examples/svg/draganddrop/delayedencoding/mimedata.cpp
+++ b/examples/svg/draganddrop/delayedencoding/mimedata.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/draganddrop/delayedencoding/mimedata.h b/examples/svg/draganddrop/delayedencoding/mimedata.h
index 4d84bd0..1a5bd98 100644
--- a/examples/svg/draganddrop/delayedencoding/mimedata.h
+++ b/examples/svg/draganddrop/delayedencoding/mimedata.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/draganddrop/delayedencoding/sourcewidget.cpp b/examples/svg/draganddrop/delayedencoding/sourcewidget.cpp
index 0373edb..0e20461 100644
--- a/examples/svg/draganddrop/delayedencoding/sourcewidget.cpp
+++ b/examples/svg/draganddrop/delayedencoding/sourcewidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/draganddrop/delayedencoding/sourcewidget.h b/examples/svg/draganddrop/delayedencoding/sourcewidget.h
index ef2766a..b0f0383 100644
--- a/examples/svg/draganddrop/delayedencoding/sourcewidget.h
+++ b/examples/svg/draganddrop/delayedencoding/sourcewidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/draganddrop/draganddrop.pro b/examples/svg/draganddrop/draganddrop.pro
index 99fecb0..554e4d3 100644
--- a/examples/svg/draganddrop/draganddrop.pro
+++ b/examples/svg/draganddrop/draganddrop.pro
@@ -1,3 +1,2 @@
TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += delayedencoding
-QT+=widgets
+qtHaveModule(widgets): SUBDIRS += delayedencoding
diff --git a/examples/svg/embedded/desktopservices/contenttab.cpp b/examples/svg/embedded/desktopservices/contenttab.cpp
index 5c82611..172ea9e 100644
--- a/examples/svg/embedded/desktopservices/contenttab.cpp
+++ b/examples/svg/embedded/desktopservices/contenttab.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/desktopservices/contenttab.h b/examples/svg/embedded/desktopservices/contenttab.h
index 9f0a824..8162f38 100644
--- a/examples/svg/embedded/desktopservices/contenttab.h
+++ b/examples/svg/embedded/desktopservices/contenttab.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/desktopservices/desktopwidget.cpp b/examples/svg/embedded/desktopservices/desktopwidget.cpp
index 75cc249..7a26443 100644
--- a/examples/svg/embedded/desktopservices/desktopwidget.cpp
+++ b/examples/svg/embedded/desktopservices/desktopwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/desktopservices/desktopwidget.h b/examples/svg/embedded/desktopservices/desktopwidget.h
index 6c1539c..6c5c667 100644
--- a/examples/svg/embedded/desktopservices/desktopwidget.h
+++ b/examples/svg/embedded/desktopservices/desktopwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/desktopservices/linktab.cpp b/examples/svg/embedded/desktopservices/linktab.cpp
index 523a104..f710c95 100644
--- a/examples/svg/embedded/desktopservices/linktab.cpp
+++ b/examples/svg/embedded/desktopservices/linktab.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/desktopservices/linktab.h b/examples/svg/embedded/desktopservices/linktab.h
index 8d13475..3b7e9b4 100644
--- a/examples/svg/embedded/desktopservices/linktab.h
+++ b/examples/svg/embedded/desktopservices/linktab.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/desktopservices/main.cpp b/examples/svg/embedded/desktopservices/main.cpp
index 878d589..e135800 100644
--- a/examples/svg/embedded/desktopservices/main.cpp
+++ b/examples/svg/embedded/desktopservices/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/embedded.pro b/examples/svg/embedded/embedded.pro
index 09cbcd2..9545cc4 100644
--- a/examples/svg/embedded/embedded.pro
+++ b/examples/svg/embedded/embedded.pro
@@ -1,3 +1,2 @@
TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo
-QT+=widgets
+qtHaveModule(widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo
diff --git a/examples/svg/embedded/fluidlauncher/demoapplication.cpp b/examples/svg/embedded/fluidlauncher/demoapplication.cpp
index 96af4ae..ea7f5d6 100644
--- a/examples/svg/embedded/fluidlauncher/demoapplication.cpp
+++ b/examples/svg/embedded/fluidlauncher/demoapplication.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/fluidlauncher/demoapplication.h b/examples/svg/embedded/fluidlauncher/demoapplication.h
index 20d22ac..da12f05 100644
--- a/examples/svg/embedded/fluidlauncher/demoapplication.h
+++ b/examples/svg/embedded/fluidlauncher/demoapplication.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp b/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp
index 60e788c..a5af617 100644
--- a/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp
+++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/fluidlauncher/fluidlauncher.h b/examples/svg/embedded/fluidlauncher/fluidlauncher.h
index 8278971..6fee1e1 100644
--- a/examples/svg/embedded/fluidlauncher/fluidlauncher.h
+++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/fluidlauncher/main.cpp b/examples/svg/embedded/fluidlauncher/main.cpp
index 565face..d8078cc 100644
--- a/examples/svg/embedded/fluidlauncher/main.cpp
+++ b/examples/svg/embedded/fluidlauncher/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/fluidlauncher/pictureflow.cpp b/examples/svg/embedded/fluidlauncher/pictureflow.cpp
index d0dfe87..eb963f7 100644
--- a/examples/svg/embedded/fluidlauncher/pictureflow.cpp
+++ b/examples/svg/embedded/fluidlauncher/pictureflow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the ActiveQt framework of the Qt Toolkit.
diff --git a/examples/svg/embedded/fluidlauncher/pictureflow.h b/examples/svg/embedded/fluidlauncher/pictureflow.h
index 13e676b..a72099d 100644
--- a/examples/svg/embedded/fluidlauncher/pictureflow.h
+++ b/examples/svg/embedded/fluidlauncher/pictureflow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the ActiveQt framework of the Qt Toolkit.
diff --git a/examples/svg/embedded/fluidlauncher/slideshow.cpp b/examples/svg/embedded/fluidlauncher/slideshow.cpp
index 5a3da0d..608a9f1 100644
--- a/examples/svg/embedded/fluidlauncher/slideshow.cpp
+++ b/examples/svg/embedded/fluidlauncher/slideshow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/fluidlauncher/slideshow.h b/examples/svg/embedded/fluidlauncher/slideshow.h
index 2ebc6a2..7f91268 100644
--- a/examples/svg/embedded/fluidlauncher/slideshow.h
+++ b/examples/svg/embedded/fluidlauncher/slideshow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/weatherinfo/weatherinfo.cpp b/examples/svg/embedded/weatherinfo/weatherinfo.cpp
index 3648309..3425819 100644
--- a/examples/svg/embedded/weatherinfo/weatherinfo.cpp
+++ b/examples/svg/embedded/weatherinfo/weatherinfo.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
index a10910e..7e6dc47 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
index 18c5eaa..7ead063 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embeddedsvgviewer/main.cpp b/examples/svg/embeddedsvgviewer/main.cpp
index 287e2a5..40c3cfd 100644
--- a/examples/svg/embeddedsvgviewer/main.cpp
+++ b/examples/svg/embeddedsvgviewer/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/network/bearercloud/bearercloud.cpp b/examples/svg/network/bearercloud/bearercloud.cpp
index 02b6c50..b2e9b9b 100644
--- a/examples/svg/network/bearercloud/bearercloud.cpp
+++ b/examples/svg/network/bearercloud/bearercloud.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/network/bearercloud/bearercloud.h b/examples/svg/network/bearercloud/bearercloud.h
index cd8e45e..277c904 100644
--- a/examples/svg/network/bearercloud/bearercloud.h
+++ b/examples/svg/network/bearercloud/bearercloud.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/network/bearercloud/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp
index 0531ad2..df2922a 100644
--- a/examples/svg/network/bearercloud/cloud.cpp
+++ b/examples/svg/network/bearercloud/cloud.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/network/bearercloud/cloud.h b/examples/svg/network/bearercloud/cloud.h
index 1756b81..ec29d46 100644
--- a/examples/svg/network/bearercloud/cloud.h
+++ b/examples/svg/network/bearercloud/cloud.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/network/bearercloud/main.cpp b/examples/svg/network/bearercloud/main.cpp
index b81bca8..bd74c8c 100644
--- a/examples/svg/network/bearercloud/main.cpp
+++ b/examples/svg/network/bearercloud/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/network/network.pro b/examples/svg/network/network.pro
index 6cf6c42..cd3cc86 100644
--- a/examples/svg/network/network.pro
+++ b/examples/svg/network/network.pro
@@ -1,3 +1,2 @@
TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += bearercloud
-QT+=widgets
+qtHaveModule(widgets): SUBDIRS += bearercloud
diff --git a/examples/svg/opengl/framebufferobject/glwidget.cpp b/examples/svg/opengl/framebufferobject/glwidget.cpp
index 1f3ff78..b3dadc8 100644
--- a/examples/svg/opengl/framebufferobject/glwidget.cpp
+++ b/examples/svg/opengl/framebufferobject/glwidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/opengl/framebufferobject/glwidget.h b/examples/svg/opengl/framebufferobject/glwidget.h
index c689ad5..650cd52 100644
--- a/examples/svg/opengl/framebufferobject/glwidget.h
+++ b/examples/svg/opengl/framebufferobject/glwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/opengl/framebufferobject/main.cpp b/examples/svg/opengl/framebufferobject/main.cpp
index 3a414be..68ff064 100644
--- a/examples/svg/opengl/framebufferobject/main.cpp
+++ b/examples/svg/opengl/framebufferobject/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro
index fd845b6..9ebf5ed 100644
--- a/examples/svg/opengl/opengl.pro
+++ b/examples/svg/opengl/opengl.pro
@@ -1,3 +1,2 @@
TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += framebufferobject
-QT+=widgets
+qtHaveModule(widgets): SUBDIRS += framebufferobject
diff --git a/examples/svg/richtext/richtext.pro b/examples/svg/richtext/richtext.pro
index be9c6c3..8d238e6 100644
--- a/examples/svg/richtext/richtext.pro
+++ b/examples/svg/richtext/richtext.pro
@@ -1,3 +1,2 @@
TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += textobject
-QT+=widgets
+qtHaveModule(widgets): SUBDIRS += textobject
diff --git a/examples/svg/richtext/textobject/main.cpp b/examples/svg/richtext/textobject/main.cpp
index 4a0a6a0..910d8c4 100644
--- a/examples/svg/richtext/textobject/main.cpp
+++ b/examples/svg/richtext/textobject/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/richtext/textobject/svgtextobject.cpp b/examples/svg/richtext/textobject/svgtextobject.cpp
index 8e3e3e9..ab2a1c8 100644
--- a/examples/svg/richtext/textobject/svgtextobject.cpp
+++ b/examples/svg/richtext/textobject/svgtextobject.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/richtext/textobject/svgtextobject.h b/examples/svg/richtext/textobject/svgtextobject.h
index f9ba114..ad98770 100644
--- a/examples/svg/richtext/textobject/svgtextobject.h
+++ b/examples/svg/richtext/textobject/svgtextobject.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/richtext/textobject/window.cpp b/examples/svg/richtext/textobject/window.cpp
index ba1d16d..1331546 100644
--- a/examples/svg/richtext/textobject/window.cpp
+++ b/examples/svg/richtext/textobject/window.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/richtext/textobject/window.h b/examples/svg/richtext/textobject/window.h
index 7551233..63942fc 100644
--- a/examples/svg/richtext/textobject/window.h
+++ b/examples/svg/richtext/textobject/window.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro
index 979f391..c828a95 100644
--- a/examples/svg/svg.pro
+++ b/examples/svg/svg.pro
@@ -1,8 +1,6 @@
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
-
-QT+=widgets
+qtHaveModule(opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl
diff --git a/examples/svg/svggenerator/displaywidget.cpp b/examples/svg/svggenerator/displaywidget.cpp
index 4bb6459..d6a8b51 100644
--- a/examples/svg/svggenerator/displaywidget.cpp
+++ b/examples/svg/svggenerator/displaywidget.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/displaywidget.h b/examples/svg/svggenerator/displaywidget.h
index eca7f5d..f5d8598 100644
--- a/examples/svg/svggenerator/displaywidget.h
+++ b/examples/svg/svggenerator/displaywidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/doc/src/svggenerator.qdoc b/examples/svg/svggenerator/doc/src/svggenerator.qdoc
index f9ec684..89ac9d5 100644
--- a/examples/svg/svggenerator/doc/src/svggenerator.qdoc
+++ b/examples/svg/svggenerator/doc/src/svggenerator.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -117,6 +117,6 @@
application, and can be used to show the contents of SVG files created
by this example.
- See the QtSvg module documentation for more information about SVG and Qt's
+ See the Qt SVG module documentation for more information about SVG and Qt's
SVG classes.
*/
diff --git a/examples/svg/svggenerator/main.cpp b/examples/svg/svggenerator/main.cpp
index a244f67..ddc94ae 100644
--- a/examples/svg/svggenerator/main.cpp
+++ b/examples/svg/svggenerator/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/window.cpp b/examples/svg/svggenerator/window.cpp
index 36c281e..faf7a94 100644
--- a/examples/svg/svggenerator/window.cpp
+++ b/examples/svg/svggenerator/window.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/window.h b/examples/svg/svggenerator/window.h
index 6dd55c1..4363ddc 100644
--- a/examples/svg/svggenerator/window.h
+++ b/examples/svg/svggenerator/window.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/doc/src/svgviewer.qdoc b/examples/svg/svgviewer/doc/src/svgviewer.qdoc
index 0b04792..b1da95d 100644
--- a/examples/svg/svgviewer/doc/src/svgviewer.qdoc
+++ b/examples/svg/svgviewer/doc/src/svgviewer.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -42,5 +42,5 @@
a QImage. This allows testing of drawing accuracy and performance for both the
native, raster, and OpenGL paint engines.
- See the QtSvg module documentation for more information about SVG and Qt's SVG classes.
+ See the Qt SVG module documentation for more information about SVG and Qt's SVG classes.
*/
diff --git a/examples/svg/svgviewer/main.cpp b/examples/svg/svgviewer/main.cpp
index c8376c5..140490a 100644
--- a/examples/svg/svgviewer/main.cpp
+++ b/examples/svg/svgviewer/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/mainwindow.cpp b/examples/svg/svgviewer/mainwindow.cpp
index 71723ee..497d390 100644
--- a/examples/svg/svgviewer/mainwindow.cpp
+++ b/examples/svg/svgviewer/mainwindow.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/mainwindow.h b/examples/svg/svgviewer/mainwindow.h
index 09c4cea..8bfb885 100644
--- a/examples/svg/svgviewer/mainwindow.h
+++ b/examples/svg/svgviewer/mainwindow.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/svgview.cpp b/examples/svg/svgviewer/svgview.cpp
index 4c6f852..da9a4ae 100644
--- a/examples/svg/svgviewer/svgview.cpp
+++ b/examples/svg/svgviewer/svgview.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/svgview.h b/examples/svg/svgviewer/svgview.h
index e2635a0..944401a 100644
--- a/examples/svg/svgviewer/svgview.h
+++ b/examples/svg/svgviewer/svgview.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
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