diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-20 19:46:28 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-20 19:46:39 +0100 |
| commit | 9144382681a93ccd0f60acf3fccf6d141aa9a53d (patch) | |
| tree | 4d5a7f0fd811c1391927a8bbdbd60da6e0f06000 /examples/svg/svgviewer | |
| parent | 059802d705b2adda8ccacdf1948d05a918d8a9ef (diff) | |
| parent | 84abe5fcf2a70de7bf8503641e8617383693882e (diff) | |
| download | qtsvg-9144382681a93ccd0f60acf3fccf6d141aa9a53d.tar.gz | |
Merge branch 'stable' into release
Change-Id: I9fa700f17504e7b0e8544d8095e753641bb44a7d
Diffstat (limited to 'examples/svg/svgviewer')
| -rw-r--r-- | examples/svg/svgviewer/doc/src/svgviewer.qdoc | 4 | ||||
| -rw-r--r-- | examples/svg/svgviewer/main.cpp | 2 | ||||
| -rw-r--r-- | examples/svg/svgviewer/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/svg/svgviewer/mainwindow.h | 2 | ||||
| -rw-r--r-- | examples/svg/svgviewer/svgview.cpp | 2 | ||||
| -rw-r--r-- | examples/svg/svgviewer/svgview.h | 2 | ||||
| -rw-r--r-- | examples/svg/svgviewer/svgviewer.pro | 2 |
7 files changed, 8 insertions, 8 deletions
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 |