From c96f2a9e3b2c86bf3c793b5e54fc9031c6af7291 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 13 Jan 2015 11:10:30 +0100 Subject: Bump copyright year to 2015 Change-Id: I953d93b1e6d1cfe01374645fcb50746c91730eba Reviewed-by: Friedemann Kleint --- LICENSE.LGPLv21 | 2 +- LICENSE.LGPLv3 | 2 +- src/assistant/assistant/mainwindow.cpp | 4 ++-- src/designer/src/designer/versiondialog.cpp | 4 ++-- src/linguist/linguist/mainwindow.cpp | 4 ++-- src/linguist/lrelease/lrelease.1 | 2 +- src/linguist/lupdate/lupdate.1 | 2 +- src/qconfig/main.cpp | 4 ++-- src/qdbus/qdbusviewer/mainwindow.cpp | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 341aa9eea..d26836dcc 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -1,6 +1,6 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal You may use, distribute and copy the Qt GUI Toolkit under the terms of diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index aed671a0c..747fb695c 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -1,6 +1,6 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). Contact: http://www.qt-project.org/legal You may use, distribute and copy the Qt GUI Toolkit under the terms of diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp index 8b7afc746..f040c228a 100644 --- a/src/assistant/assistant/mainwindow.cpp +++ b/src/assistant/assistant/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Assistant of the Qt Toolkit. @@ -895,7 +895,7 @@ void MainWindow::showAboutDialog() "

%1

" "

Version %2

" "

Copyright (C) %3 Digia Plc and/or its subsidiary(-ies).

") - .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), QStringLiteral("2014")), + .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), QStringLiteral("2015")), resources); QLatin1String path(":/qt-project.org/assistant/images/assistant-128.png"); aboutDia.setPixmap(QString(path)); diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp index ff42c26be..32ba9f722 100644 --- a/src/designer/src/designer/versiondialog.cpp +++ b/src/designer/src/designer/versiondialog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Designer of the Qt Toolkit. @@ -165,7 +165,7 @@ VersionDialog::VersionDialog(QWidget *parent) lbl->setText(tr("%1" "
Copyright (C) %2 Digia Plc and/or its subsidiary(-ies)." - ).arg(version, QStringLiteral("2014"))); + ).arg(version, QStringLiteral("2015"))); lbl->setWordWrap(true); lbl->setOpenExternalLinks(true); diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index 59393c695..0c9d92321 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Linguist of the Qt Toolkit. @@ -1338,7 +1338,7 @@ void MainWindow::about() "

Qt Linguist is a tool for adding translations to Qt " "applications.

" "

Copyright (C) %2 Digia Plc and/or its subsidiary(-ies)." - ).arg(version, QStringLiteral("2014"))); + ).arg(version, QStringLiteral("2015"))); box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist")); box.setIcon(QMessageBox::NoIcon); diff --git a/src/linguist/lrelease/lrelease.1 b/src/linguist/lrelease/lrelease.1 index 1852edce7..e63521ea9 100644 --- a/src/linguist/lrelease/lrelease.1 +++ b/src/linguist/lrelease/lrelease.1 @@ -1,6 +1,6 @@ .TH lrelease 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*- .\" -.\" Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +.\" Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). .\" Contact: http://www.qt-project.org/legal .\" .\" This file is part of the QtGui module of the Qt Toolkit. diff --git a/src/linguist/lupdate/lupdate.1 b/src/linguist/lupdate/lupdate.1 index 844ae171e..1d9f5de58 100644 --- a/src/linguist/lupdate/lupdate.1 +++ b/src/linguist/lupdate/lupdate.1 @@ -1,6 +1,6 @@ .TH lupdate 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*- .\" -.\" Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +.\" Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). .\" Contact: http://www.qt-project.org/legal .\" .\" This file is part of the QtGui module of the Qt Toolkit. diff --git a/src/qconfig/main.cpp b/src/qconfig/main.cpp index db6b0a673..28616926d 100644 --- a/src/qconfig/main.cpp +++ b/src/qconfig/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. @@ -511,7 +511,7 @@ void Main::about() "

Qtopia Core build configuration

" "

" "

Version 2.0

" - "

Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).

" + "

Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).

" "

" ); } diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp index 48feacd4d..14565897d 100644 --- a/src/qdbus/qdbusviewer/mainwindow.cpp +++ b/src/qdbus/qdbusviewer/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. @@ -95,7 +95,7 @@ void MainWindow::about() "

%1

" "

Version %2

" "

Copyright (C) %3 Digia Plc and/or its subsidiary(-ies).

") - .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2014"))); + .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2015"))); box.setWindowTitle(tr("D-Bus Viewer")); box.exec(); } -- cgit v1.2.3 From 1f2bed2bc8ce2c865b79c4948fba100b748c8bcb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 12 Jan 2015 16:12:42 +0100 Subject: qtdiag/Windows: Output GPU information similar to dxdiag. Task-number: QTBUG-43263 Change-Id: I348a97a843bcfc2339a06f7408dea72e91d9e0d0 Reviewed-by: Laszlo Agocs --- src/qtdiag/qtdiag.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp index 15ae06556..17480ee31 100644 --- a/src/qtdiag/qtdiag.cpp +++ b/src/qtdiag/qtdiag.cpp @@ -62,6 +62,7 @@ #include #include #include +#include #include @@ -376,6 +377,14 @@ QString qtDiag(unsigned flags) #else Q_UNUSED(flags) #endif // !QT_NO_OPENGL + + // On Windows, this will provide addition GPU info similar to the output of dxdiag. + const QVariant gpuInfoV = QGuiApplication::platformNativeInterface()->property("gpu"); + if (gpuInfoV.type() == QVariant::Map) { + const QString description = gpuInfoV.toMap().value(QStringLiteral("printable")).toString(); + if (!description.isEmpty()) + str << "\nGPU:\n" << description; + } return result; } -- cgit v1.2.3