diff options
Diffstat (limited to 'util/qt3d')
| -rw-r--r-- | util/qt3d/qglinfo/aboutdialog.cpp | 72 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/aboutdialog.h | 67 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/aboutdialog.ui | 54 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/fpswidget.cpp | 279 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/fpswidget.h | 93 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/images/teapot-logo.png | bin | 3322 -> 0 bytes | |||
| -rw-r--r-- | util/qt3d/qglinfo/main.cpp | 64 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qglinfo.cpp | 344 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qglinfo.h | 78 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qglinfo.pro | 27 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qglinfo.qrc | 5 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qglinfo.rc | 1 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qglinfowindow.cpp | 162 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qglinfowindow.h | 77 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qglinfowindow.ui | 218 | ||||
| -rw-r--r-- | util/qt3d/qglinfo/qtquick3d.ico | bin | 51262 -> 0 bytes | |||
| -rw-r--r-- | util/qt3d/qt3d.pro | 2 |
17 files changed, 0 insertions, 1543 deletions
diff --git a/util/qt3d/qglinfo/aboutdialog.cpp b/util/qt3d/qglinfo/aboutdialog.cpp deleted file mode 100644 index 8598cd55..00000000 --- a/util/qt3d/qglinfo/aboutdialog.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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 "aboutdialog.h" -#include "ui_aboutdialog.h" - -AboutDialog::AboutDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::AboutDialog) -{ - ui->setupUi(this); -} - -AboutDialog::~AboutDialog() -{ - delete ui; -} - -void AboutDialog::changeEvent(QEvent *e) -{ - QDialog::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - ui->retranslateUi(this); - break; - default: - break; - } -} - -void AboutDialog::on_pushButton_clicked() -{ - close(); -} diff --git a/util/qt3d/qglinfo/aboutdialog.h b/util/qt3d/qglinfo/aboutdialog.h deleted file mode 100644 index fee94a28..00000000 --- a/util/qt3d/qglinfo/aboutdialog.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef ABOUTDIALOG_H -#define ABOUTDIALOG_H - -#include <QDialog> - -namespace Ui { - class AboutDialog; -} - -class AboutDialog : public QDialog { - Q_OBJECT -public: - AboutDialog(QWidget *parent = 0); - ~AboutDialog(); - -protected: - void changeEvent(QEvent *e); - -private: - Ui::AboutDialog *ui; - -private slots: - void on_pushButton_clicked(); -}; - -#endif // ABOUTDIALOG_H diff --git a/util/qt3d/qglinfo/aboutdialog.ui b/util/qt3d/qglinfo/aboutdialog.ui deleted file mode 100644 index 7408bc1e..00000000 --- a/util/qt3d/qglinfo/aboutdialog.ui +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>AboutDialog</class> - <widget class="QDialog" name="AboutDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>157</width> - <height>170</height> - </rect> - </property> - <property name="windowTitle"> - <string>About</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:20pt;">QGL Info Tool</span></p></body></html></string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="qglinfo.qrc">:/images/teapot</pixmap> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="pushButton"> - <property name="text"> - <string>Ok</string> - </property> - </widget> - </item> - </layout> - </widget> - <resources> - <include location="qglinfo.qrc"/> - </resources> - <connections/> -</ui> diff --git a/util/qt3d/qglinfo/fpswidget.cpp b/util/qt3d/qglinfo/fpswidget.cpp deleted file mode 100644 index 3c9ee1e8..00000000 --- a/util/qt3d/qglinfo/fpswidget.cpp +++ /dev/null @@ -1,279 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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 "fpswidget.h" - -#include <QtCore/qtimer.h> -#include <QtCore/qdatetime.h> - -static GLfloat materialColor[] = { 0.1f, 0.85f, 0.25f, 1.0f }; - -// dont drive the updates any faster than every this many millisecondss -#define MAX_ANIM_FREQUENCY 5 - -#define QGL_CUBE_SIZE (6 * 6 * (3 + 3)) -static float const cubeVertices[QGL_CUBE_SIZE] = { - -0.5f, -0.5f, -0.5f, -1.0f, 0.0f, 0.0f, - -0.5f, -0.5f, 0.5f, -1.0f, 0.0f, 0.0f, - -0.5f, 0.5f, 0.5f, -1.0f, 0.0f, 0.0f, - -0.5f, -0.5f, -0.5f, -1.0f, 0.0f, 0.0f, - -0.5f, 0.5f, 0.5f, -1.0f, 0.0f, 0.0f, - -0.5f, 0.5f, -0.5f, -1.0f, 0.0f, 0.0f, - - -0.5f, 0.5f, -0.5f, 0.0f, 1.0f, 0.0f, - -0.5f, 0.5f, 0.5f, 0.0f, 1.0f, 0.0f, - 0.5f, 0.5f, 0.5f, 0.0f, 1.0f, 0.0f, - -0.5f, 0.5f, -0.5f, 0.0f, 1.0f, 0.0f, - 0.5f, 0.5f, 0.5f, 0.0f, 1.0f, 0.0f, - 0.5f, 0.5f, -0.5f, 0.0f, 1.0f, 0.0f, - - 0.5f, 0.5f, -0.5f, 1.0f, 0.0f, 0.0f, - 0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 0.0f, - 0.5f, -0.5f, 0.5f, 1.0f, 0.0f, 0.0f, - 0.5f, 0.5f, -0.5f, 1.0f, 0.0f, 0.0f, - 0.5f, -0.5f, 0.5f, 1.0f, 0.0f, 0.0f, - 0.5f, -0.5f, -0.5f, 1.0f, 0.0f, 0.0f, - - 0.5f, -0.5f, -0.5f, 0.0f, -1.0f, 0.0f, - 0.5f, -0.5f, 0.5f, 0.0f, -1.0f, 0.0f, - -0.5f, -0.5f, 0.5f, 0.0f, -1.0f, 0.0f, - 0.5f, -0.5f, -0.5f, 0.0f, -1.0f, 0.0f, - -0.5f, -0.5f, 0.5f, 0.0f, -1.0f, 0.0f, - -0.5f, -0.5f, -0.5f, 0.0f, -1.0f, 0.0f, - - 0.5f, -0.5f, 0.5f, 0.0f, 0.0f, 1.0f, - 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, 1.0f, - -0.5f, 0.5f, 0.5f, 0.0f, 0.0f, 1.0f, - 0.5f, -0.5f, 0.5f, 0.0f, 0.0f, 1.0f, - -0.5f, 0.5f, 0.5f, 0.0f, 0.0f, 1.0f, - -0.5f, -0.5f, 0.5f, 0.0f, 0.0f, 1.0f, - - 0.5f, 0.5f, -0.5f, 0.0f, 0.0f, -1.0f, - 0.5f, -0.5f, -0.5f, 0.0f, 0.0f, -1.0f, - -0.5f, -0.5f, -0.5f, 0.0f, 0.0f, -1.0f, - 0.5f, 0.5f, -0.5f, 0.0f, 0.0f, -1.0f, - -0.5f, -0.5f, -0.5f, 0.0f, 0.0f, -1.0f, - -0.5f, 0.5f, -0.5f, 0.0f, 0.0f, -1.0f, -}; - -FPSWidget::FPSWidget(QWidget *parent) - : QGLWidget(parent) - , time(new QTime()) - , frameTime(new QTime()) - , timer(new QTimer(this)) - , goAwayTimer(new QTimer(this)) - , xrot(0) - , yrot(0) - , zrot(0) - , frameElapsed(0) - , frameCount(0) - , totalFrameTime(0) -{ - setAttribute(Qt::WA_DeleteOnClose); - setWindowTitle(tr("Generating Frames/Second")); - time->start(); - frameTime->start(); - connect(timer, SIGNAL(timeout()), - this, SLOT(animate())); - timer->start(0); // call the animation as soon as we return to the event loop - goAwayTimer = new QTimer(this); - connect(goAwayTimer, SIGNAL(timeout()), - this, SLOT(close())); - goAwayTimer->start(30000); -} - -FPSWidget::~FPSWidget() -{ - delete time; -} - -#if defined(QT_OPENGL_ES_2) - -void FPSWidget::setupShaders() -{ - QGLShader *vshader = new QGLShader(QGLShader::Vertex, this); - const char *vsrc = { - "attribute highp vec4 vertex;\n" - "attribute mediump vec3 normal;\n" - "uniform mediump mat4 matrix;\n" - "varying mediump float angle;\n" - "void main(void)\n" - "{\n" - " vec3 toLight = normalize(vec3(0.5, 5.0, 7.0));\n" - " angle = max(dot(normal, toLight), 0.0);\n" - " gl_Position = matrix * vertex;\n" - "}\n" - }; - vshader->compileSourceCode(vsrc); - - QGLShader *fshader = new QGLShader(QGLShader::Fragment, this); - const char *fsrc = { - "uniform mediump vec4 material;\n" - "varying mediump float angle;\n" - "void main(void)\n" - "{\n" - " gl_FragColor = material * 0.2 + material * 0.8 * angle;\n" - "}\n" - }; - fshader->compileSourceCode(fsrc); - - program.addShader(vshader); - program.addShader(fshader); - program.link(); - - vertexAttr = program.attributeLocation("vertex"); - normalAttr = program.attributeLocation("normal"); - matrixUniform = program.uniformLocation("matrix"); - materialUniform = program.uniformLocation("material"); - - program.bind(); -} - -#endif - -#ifndef GL_MULTISAMPLE -#define GL_MULTISAMPLE 0x809D -#endif - -void FPSWidget::initializeGL() -{ - glClearColor(0.9f, 0.95f, 0.8f, 1.0f); - glEnable(GL_DEPTH_TEST); - glEnable(GL_CULL_FACE); -#if defined(QT_OPENGL_ES_2) - setupShaders(); -#else - glShadeModel(GL_SMOOTH); - glEnable(GL_LIGHTING); - glEnable(GL_LIGHT0); - glEnable(GL_MULTISAMPLE); - static GLfloat lightPosition[4] = { 0.5, 5.0, 7.0, 1.0 }; - glLightfv(GL_LIGHT0, GL_POSITION, lightPosition); -#endif -} - -void FPSWidget::resizeGL(int w, int h) -{ - glViewport(0, 0, w, h); -#if !defined(QT_OPENGL_ES_2) - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); -#endif - int side = qMin(w, h); - qreal ws = (qreal)w / (qreal)side; - qreal hs = (qreal)h / (qreal)side; -#if defined(QT_OPENGL_ES_2) - projection.setToIdentity(); - projection.ortho(-ws, ws, -hs, hs, -10.0f, 10.0f); -#else - glOrtho(-ws, ws, -hs, hs, -10.0f, 10.0f); -#endif -} - -void FPSWidget::paintGL() -{ - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - -#if !defined(QT_OPENGL_ES_2) - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - glRotatef(xrot, 1.0, 0.0, 0.0); - glRotatef(yrot, 0.0, 1.0, 0.0); - glRotatef(zrot, 0.0, 0.0, 1.0); - - glVertexPointer(3, GL_FLOAT, 6 * sizeof(GLfloat), cubeVertices); - glEnableClientState(GL_VERTEX_ARRAY); - glNormalPointer(GL_FLOAT, 6 * sizeof(GLfloat), cubeVertices); - glEnableClientState(GL_NORMAL_ARRAY); - - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, materialColor); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, materialColor); -#else - modelView.setToIdentity(); - modelView.rotate(xrot, 1.0f, 0.0f, 0.0f); - modelView.rotate(yrot, 0.0f, 1.0f, 0.0f); - modelView.rotate(zrot, 0.0f, 0.0f, 1.0f); - program.setUniformValue(matrixUniform, projection * modelView); - - QVector4D mat(materialColor[0], materialColor[1], - materialColor[2], materialColor[3]); - program.setUniformValue(materialUniform, mat); - - program.setAttributeArray(vertexAttr, cubeVertices, 3, 6 * sizeof(GLfloat)); - program.setAttributeArray(normalAttr, cubeVertices+3, 3, 6 * sizeof(GLfloat)); - program.enableAttributeArray(vertexAttr); - program.enableAttributeArray(normalAttr); -#endif - - glDrawArrays(GL_TRIANGLES, 0, 36); - -#if !defined(QT_OPENGL_ES_2) - glDisableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_NORMAL_ARRAY); -#else - program.disableAttributeArray(vertexAttr); - program.disableAttributeArray(normalAttr); -#endif - QString framesPerSecond = QString::fromLatin1("%1 fps").arg(1000.0f / ((qreal)totalFrameTime / (qreal)frameCount)); -} - -void FPSWidget::animate() -{ - int elapsed = time->restart(); - frameElapsed += elapsed; - if (frameElapsed > MAX_ANIM_FREQUENCY) - { - frameElapsed += elapsed; - int adv = frameElapsed / 10; - if (adv > 0) - { - frameCount += 1; - totalFrameTime += frameElapsed; - emit fps(1000.0f / ((qreal)frameTime->elapsed() / (qreal)frameCount)); - xrot = (xrot + adv) % 360; - yrot = (xrot + adv) % 360; - zrot = (xrot + adv) % 360; - update(); - frameElapsed = 0; - } - } -} diff --git a/util/qt3d/qglinfo/fpswidget.h b/util/qt3d/qglinfo/fpswidget.h deleted file mode 100644 index 495de4b9..00000000 --- a/util/qt3d/qglinfo/fpswidget.h +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef FPSWIDGET_H -#define FPSWIDGET_H - -#include <QGLWidget> -#if defined(QT_OPENGL_ES_2) -#include <QtGui/qvector3d.h> -#include <QtGui/qmatrix4x4.h> -#include <QtOpenGL/qglshaderprogram.h> -#endif - -class QTime; -class QTimer; - -class FPSWidget : public QGLWidget -{ - Q_OBJECT -public: - FPSWidget(QWidget *parent = 0); - ~FPSWidget(); - void initializeGL(); - void resizeGL(int, int); - void paintGL(); -protected: - void keyPressEvent(QKeyEvent *) { close(); } - void mousePressEvent(QMouseEvent *) { close(); } -signals: - void fps(int); -private slots: - void animate(); -private: - QTime *time; - QTime *frameTime; - QTimer *timer; - QTimer *goAwayTimer; - int xrot, yrot, zrot; - int frameElapsed; - int frameCount; - int totalFrameTime; -#if defined(QT_OPENGL_ES_2) - void setupShaders(); - - QGLShaderProgram program; - QMatrix4x4 projection; - QMatrix4x4 modelView; - int vertexAttr; - int normalAttr; - int matrixUniform; - int materialUniform; -#endif -}; - -#endif // FPSWIDGET_H diff --git a/util/qt3d/qglinfo/images/teapot-logo.png b/util/qt3d/qglinfo/images/teapot-logo.png Binary files differdeleted file mode 100644 index a82c33c1..00000000 --- a/util/qt3d/qglinfo/images/teapot-logo.png +++ /dev/null diff --git a/util/qt3d/qglinfo/main.cpp b/util/qt3d/qglinfo/main.cpp deleted file mode 100644 index 317676c4..00000000 --- a/util/qt3d/qglinfo/main.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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 <QApplication> - -#include "qglinfowindow.h" - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - - // for QSettings - QCoreApplication::setOrganizationName("Nokia"); - QCoreApplication::setOrganizationDomain("nokia.com"); - QCoreApplication::setApplicationName("qglinfo"); - - QGLInfoWindow w; - if (QApplication::arguments().contains(QLatin1String("-maximize"))) - w.showMaximized(); - else if (QApplication::arguments().contains(QLatin1String("-fullscreen"))) - w.showFullScreen(); - else - w.show(); - - return app.exec(); -} diff --git a/util/qt3d/qglinfo/qglinfo.cpp b/util/qt3d/qglinfo/qglinfo.cpp deleted file mode 100644 index e58d1005..00000000 --- a/util/qt3d/qglinfo/qglinfo.cpp +++ /dev/null @@ -1,344 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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 "qglinfo.h" - -#include <QtOpenGL/qgl.h> -#include <QtOpenGL/qglpixelbuffer.h> -#include <QtOpenGL/qglframebufferobject.h> -#include <QtOpenGL/qglshaderprogram.h> - -#include <QtCore/qtimer.h> -#include <QtCore/qdatetime.h> - -#include <QtCore/qsettings.h> - -#if !defined(QT_NO_EGL) && defined(QT_BUILD_INTERNAL) -#include <QtGui/private/qegl_p.h> -#include <QtGui/private/qeglproperties_p.h> -#endif - -QGLInfo::QGLInfo(QObject *parent) - : QObject(parent) -{ - QTimer::singleShot(0, this, SLOT(initialize())); -} - -static QString nice(const QString &s) -{ - QString r(s); - r.replace(QLatin1String("\n"), QLatin1String("<br>\n")); - r.replace(QLatin1String("true"), QLatin1String("<span style=\"color: green\">true</span>")); - r.replace(QLatin1String("false"), QLatin1String("<span style=\"color: red\">false</span>")); - return r; -} - -void QGLInfo::initialize() -{ - QWidget *win = qobject_cast<QGLWidget *>(parent()); - // We need some kind of GL context to do the querying. - QGLWidget *glWidget = new QGLWidget(win); - glWidget->makeCurrent(); - m_qtGLVersionInfo = reportQtGLVersionInfo(); - m_qtGLFeatures = reportQtGLFeatures(); - m_glVersionInfo = reportGLVersionInfo(); - m_glExtensionInfo = reportGLExtensionInfo(); - m_eglVersionInfo = reportEGLVersionInfo(); - m_eglExtensionInfo = reportEGLExtensionInfo(); - m_eglConfigInfo = reportEGLConfigInfo(); - glWidget->doneCurrent(); - delete glWidget; - - QString welcome; - { - QSettings freshStart; - if (!freshStart.contains(QLatin1String("new_install"))) - { - welcome = QLatin1String("<h1>Welcome to QtQuick 3D!</h1>" - "<p>Try running the FPS test from the " - "View menu above to confirm that Qt3Quick 3D " - "is installed correctly.</p><hr>"); - } - freshStart.setValue(QLatin1String("new_install"), true); - } - - QString html = tr("<h1>Qt GL Info Report</h1>" - "<p>Generated at: %1</p>" - "<h2>Qt GL Version Info</h2>" - "<p>%2</p>" - "<h2>Qt GL Features</h2>" - "<p>%3</p>" - "<h2>GL Version Info</h2>" - "<p>%4</p>" - "<h2>GL Extension Info</h2>" - "<p>%5</p>") - .arg(QDateTime::currentDateTime().toString()) - .arg(nice(m_qtGLVersionInfo)) - .arg(nice(m_qtGLFeatures)) - .arg(nice(m_glVersionInfo)) - .arg(nice(m_glExtensionInfo)); - if (!welcome.isEmpty()) - html.prepend(welcome); - -#if !defined(QT_NO_EGL) - html += tr("<h2>EGL Version Info</h2>" - "<p>%1</p>" - "<h2>EGL Extension Info</h2>" - "<p>%2</p>" - "<h2>EGL Configurations</h2>" - "<p>%3</p>") - .arg(nice(m_eglVersionInfo)) - .arg(nice(m_eglExtensionInfo)) - .arg(nice(m_eglConfigInfo)); -#endif - emit reportHtml(html); -} - -QString QGLInfo::report() const -{ - QString report; - report += m_qtGLVersionInfo; - report += QLatin1Char('\n'); - report += m_qtGLFeatures; - report += m_glVersionInfo; - report += tr("OpenGL extensions:\n"); - report += m_glExtensionInfo; -#if !defined(QT_NO_EGL) - report += m_eglVersionInfo; - report += tr("EGL extensions:\n"); - report += m_eglExtensionInfo; - report += tr("EGL configurations:\n"); - report += m_eglConfigInfo; -#endif - return report; -} - -QString QGLInfo::reportQtGLVersionInfo() const -{ - // Dump what Qt thinks the version is. - QGLFormat::OpenGLVersionFlags flags = QGLFormat::openGLVersionFlags(); - QByteArray version; - if ((flags & QGLFormat::OpenGL_Version_1_1) != 0) - version += "1.1 "; - if ((flags & QGLFormat::OpenGL_Version_1_2) != 0) - version += "1.2 "; - if ((flags & QGLFormat::OpenGL_Version_1_3) != 0) - version += "1.3 "; - if ((flags & QGLFormat::OpenGL_Version_1_4) != 0) - version += "1.4 "; - if ((flags & QGLFormat::OpenGL_Version_1_5) != 0) - version += "1.5 "; - if ((flags & QGLFormat::OpenGL_Version_2_0) != 0) - version += "2.0 "; - if ((flags & QGLFormat::OpenGL_Version_2_1) != 0) - version += "2.1 "; - if ((flags & QGLFormat::OpenGL_Version_3_0) != 0) - version += "3.0 "; - if ((flags & QGLFormat::OpenGL_Version_3_1) != 0) - version += "3.1 "; - if ((flags & QGLFormat::OpenGL_Version_3_2) != 0) - version += "3.2 "; - if ((flags & QGLFormat::OpenGL_Version_3_3) != 0) - version += "3.3 "; - if ((flags & QGLFormat::OpenGL_Version_4_0) != 0) - version += "4.0 "; - if ((flags & QGLFormat::OpenGL_ES_Common_Version_1_0) != 0) - version += "ES/1.0 "; - if ((flags & QGLFormat::OpenGL_ES_CommonLite_Version_1_0) != 0) - version += "ES/1.0CL "; - if ((flags & QGLFormat::OpenGL_ES_Common_Version_1_1) != 0) - version += "ES/1.1 "; - if ((flags & QGLFormat::OpenGL_ES_CommonLite_Version_1_1) != 0) - version += "ES/1.1CL "; - if ((flags & QGLFormat::OpenGL_ES_Version_2_0) != 0) - version += "ES/2.0 "; - flags &= ~(QGLFormat::OpenGL_Version_1_1 | - QGLFormat::OpenGL_Version_1_2 | - QGLFormat::OpenGL_Version_1_3 | - QGLFormat::OpenGL_Version_1_4 | - QGLFormat::OpenGL_Version_1_5 | - QGLFormat::OpenGL_Version_2_0 | - QGLFormat::OpenGL_Version_2_1 | - QGLFormat::OpenGL_Version_3_0 | - QGLFormat::OpenGL_Version_3_1 | - QGLFormat::OpenGL_Version_3_2 | - QGLFormat::OpenGL_Version_3_3 | - QGLFormat::OpenGL_Version_4_0 | - QGLFormat::OpenGL_ES_Common_Version_1_0 | - QGLFormat::OpenGL_ES_CommonLite_Version_1_0 | - QGLFormat::OpenGL_ES_Common_Version_1_1 | - QGLFormat::OpenGL_ES_CommonLite_Version_1_1 | - QGLFormat::OpenGL_ES_Version_2_0); - if (flags != 0) - version += "Other=0x" + QByteArray::number(int(flags), 16); - return QLatin1String("QGLFormat::openGLVersionFlags: ") + - QString::fromLatin1(version.constData()); -} - -static QString printBool(const char *text, bool value) -{ - return QLatin1String(text) + (value ? QLatin1String("true\n") : QLatin1String("false\n")); -} - -QString QGLInfo::reportQtGLFeatures() const -{ - QString d; - d += printBool("QGLFormat::hasOpenGL: ", QGLFormat::hasOpenGL()); - d += printBool("QGLFormat::hasOpenGLOverlays: ", QGLFormat::hasOpenGLOverlays()); - d += printBool("QGLPixelBuffer::hasOpenGLPbuffers: ", QGLPixelBuffer::hasOpenGLPbuffers()); - d += printBool("QGLFramebufferObject::hasOpenGLFramebufferObjects: ", - QGLFramebufferObject::hasOpenGLFramebufferObjects()); - d += printBool("QGLFramebufferObject::hasOpenGLFramebufferBlit: ", - QGLFramebufferObject::hasOpenGLFramebufferBlit()); - d += printBool("QGLShaderProgram::hasOpenGLShaderPrograms: ", - QGLShaderProgram::hasOpenGLShaderPrograms()); - return d; -} - -QString QGLInfo::reportGLVersionInfo() const -{ - QString d; - d += QLatin1String("OpenGL vendor string: "); - d += QLatin1String(reinterpret_cast<const char *>(glGetString(GL_VENDOR))); - d += QLatin1String("\n"); - d += QLatin1String("OpenGL renderer string: "); - d += QLatin1String(reinterpret_cast<const char *>(glGetString(GL_RENDERER))); - d += QLatin1String("\n"); - d += QLatin1String("OpenGL version string: "); - d += QLatin1String(reinterpret_cast<const char *>(glGetString(GL_VERSION))); - d += QLatin1String("\n"); - return d; -} - -QString QGLInfo::reportGLExtensionInfo() const -{ - QByteArray extString - (reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS))); - return formatExtensions(extString); -} - -QString QGLInfo::formatExtensions(const QByteArray& extString) const -{ - QString d; - QList<QByteArray> extns = extString.split(' '); - qSort(extns); - QByteArray line; - foreach (QByteArray extn, extns) { - if (extn.isEmpty()) - continue; - if (!line.isEmpty() && (line.size() + extn.size() + 1) > 70) { - d += QLatin1String(" ") + - QString::fromLatin1(line.constData()) + - QLatin1String("\n"); - line = QByteArray(); - } - line += extn; - line += char(' '); - } - if (!line.isEmpty()) { - d += QLatin1String(" ") + - QString::fromLatin1(line.constData()) + - QLatin1String("\n"); - } - return d; -} - -QString QGLInfo::reportEGLVersionInfo() const -{ -#if !defined(QT_NO_EGL) && defined(QT_BUILD_INTERNAL) - QString d; - EGLDisplay dpy = eglGetCurrentDisplay(); - d += "EGL vendor string: "; - d += reinterpret_cast<const char *>(eglQueryString(dpy, EGL_VENDOR)); - d += "\n"; - d += "EGL version string: "; - d += reinterpret_cast<const char *>(eglQueryString(dpy, EGL_VERSION)); - d += "\n"; -#ifdef EGL_CLIENT_APIS - d += "EGL client API's: "; - d += reinterpret_cast<const char *>(eglQueryString(dpy, EGL_CLIENT_APIS)); - d += "\n"; -#endif - return d; -#else - return QString(); -#endif -} - -QString QGLInfo::reportEGLExtensionInfo() const -{ -#if !defined(QT_NO_EGL) && defined(QT_BUILD_INTERNAL) - EGLDisplay dpy = eglGetCurrentDisplay(); - QByteArray extString - (reinterpret_cast<const char *>(eglQueryString(dpy, EGL_EXTENSIONS))); - return formatExtensions(extString); -#else - return QString(); -#endif -} - -QString QGLInfo::reportEGLConfigInfo() const -{ -#if !defined(QT_NO_EGL) && defined(QT_BUILD_INTERNAL) - QString d; - QEglProperties props; - EGLint count = 0; - EGLDisplay dpy = eglGetCurrentDisplay(); - EGLContext ctx = eglGetCurrentContext(); - EGLint cfgnum = 0; - if (eglQueryContext(dpy, ctx, EGL_CONFIG_ID, &cfgnum)) { - d += QLatin1String("Window configuration in use: ") + QString::number(cfgnum) + - QLatin1String("\n\n"); - } - if (!eglGetConfigs(dpy, 0, 0, &count) || count < 1) - return d; - EGLConfig *configs = new EGLConfig [count]; - eglGetConfigs(dpy, configs, count, &count); - for (EGLint index = 0; index < count; ++index) { - props = QEglProperties(configs[index]); - d += props.toString() + QLatin1String("\n\n"); - } - delete [] configs; - return d; -#else - return QString(); -#endif -} diff --git a/util/qt3d/qglinfo/qglinfo.h b/util/qt3d/qglinfo/qglinfo.h deleted file mode 100644 index 53aa47dc..00000000 --- a/util/qt3d/qglinfo/qglinfo.h +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef QGLINFO_H -#define QGLINFO_H - -#include <QtCore/qstring.h> -#include <QtCore/qobject.h> -#include <QtCore/qbytearray.h> - -class QGLInfo : public QObject -{ - Q_OBJECT -public: - QGLInfo(QObject *parent = 0); - QString report() const; -signals: - void reportHtml(const QString &); -private slots: - void initialize(); -private: - QString reportQtGLVersionInfo() const; - QString reportQtGLFeatures() const; - QString reportGLVersionInfo() const; - QString reportGLExtensionInfo() const; - QString reportEGLVersionInfo() const; - QString reportEGLExtensionInfo() const; - QString reportEGLConfigInfo() const; - QString formatExtensions(const QByteArray& extString) const; - - QString m_qtGLVersionInfo; - QString m_qtGLFeatures; - QString m_glVersionInfo; - QString m_glExtensionInfo; - QString m_eglVersionInfo; - QString m_eglExtensionInfo; - QString m_eglConfigInfo; -}; - -#endif // QGLINFO_H diff --git a/util/qt3d/qglinfo/qglinfo.pro b/util/qt3d/qglinfo/qglinfo.pro deleted file mode 100644 index f792bb6e..00000000 --- a/util/qt3d/qglinfo/qglinfo.pro +++ /dev/null @@ -1,27 +0,0 @@ -TARGET = qglinfo -QT += qt3d widgets - -SOURCES += main.cpp \ - qglinfowindow.cpp \ - qglinfo.cpp \ - aboutdialog.cpp \ - fpswidget.cpp - -FORMS += qglinfowindow.ui \ - aboutdialog.ui -HEADERS += qglinfowindow.h \ - qglinfo.h \ - aboutdialog.h \ - fpswidget.h -RESOURCES += qglinfo.qrc - -!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL - -OTHER_FILES += \ - qglinfo.rc - -RC_FILE = qglinfo.rc - -DESTDIR = $$QT.qt3d.bins -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target diff --git a/util/qt3d/qglinfo/qglinfo.qrc b/util/qt3d/qglinfo/qglinfo.qrc deleted file mode 100644 index 1406cc27..00000000 --- a/util/qt3d/qglinfo/qglinfo.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/images"> - <file alias="teapot">images/teapot-logo.png</file> - </qresource> -</RCC> diff --git a/util/qt3d/qglinfo/qglinfo.rc b/util/qt3d/qglinfo/qglinfo.rc deleted file mode 100644 index 1b6228c9..00000000 --- a/util/qt3d/qglinfo/qglinfo.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "qtquick3d.ico" diff --git a/util/qt3d/qglinfo/qglinfowindow.cpp b/util/qt3d/qglinfo/qglinfowindow.cpp deleted file mode 100644 index 6b2d8504..00000000 --- a/util/qt3d/qglinfo/qglinfowindow.cpp +++ /dev/null @@ -1,162 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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 "qglinfowindow.h" -#include "qglinfo.h" -#include "ui_qglinfowindow.h" -#include "aboutdialog.h" -#include "fpswidget.h" - -#include <QtOpenGL/qgl.h> -#include <QtWidgets/qfiledialog.h> -#include <QtGui/qfont.h> -#include <QtCore/qdir.h> -#include <QtCore/qfile.h> -#include <QtCore/QTextStream> - -QGLInfoWindow::QGLInfoWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::QGLInfoWindow) -{ - ui->setupUi(this); - setStatusBar(0); - if (QApplication::arguments().contains(QLatin1String("-maximize")) || - QApplication::arguments().contains(QLatin1String("-fullscreen"))) - { - ui->verticalLayout->setMargin(1); - ui->verticalLayout->setContentsMargins(1, 1, 1, 1); - ui->verticalLayout_2->setMargin(1); - ui->verticalLayout_2->setContentsMargins(1, 1, 1, 1); - ui->menubar->setVisible(false); - connect(ui->quitPushButton, SIGNAL(clicked()), - this, SLOT(on_actionQuit_triggered())); - connect(ui->runFPSTestPushButton, SIGNAL(clicked()), - this, SLOT(on_actionRun_FPS_Test_triggered())); - connect(ui->saveAsPushButton, SIGNAL(clicked()), - this, SLOT(on_action_Save_As_triggered())); - QFont f = font(); - f.setPointSize(f.pointSize() * 1.4); - setFont(f); - } - else - { - ui->buttonsWidget->setVisible(false); - } - info = new QGLInfo(); - connect(info, SIGNAL(reportHtml(QString)), - ui->textBrowser, SLOT(setHtml(QString))); - ui->fpsWidget->setVisible(false); -} - -QGLInfoWindow::~QGLInfoWindow() -{ - delete ui; - delete info; -} - -void QGLInfoWindow::changeEvent(QEvent *e) -{ - QMainWindow::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - ui->retranslateUi(this); - break; - default: - break; - } -} - -void QGLInfoWindow::on_actionQuit_triggered() -{ - qApp->quit(); -} - -void QGLInfoWindow::on_action_Save_As_triggered() -{ - QString defName = QDir::home().absoluteFilePath(QLatin1String("qglinfo.txt")); - - QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"), - defName, - tr("Text (*.txt)")); - if (!fileName.isEmpty()) - { - QFile saveFile(fileName); - saveFile.open(QFile::WriteOnly); - { - QTextStream s(&saveFile); - s << info->report(); - } - saveFile.close(); - } -} - -void QGLInfoWindow::on_actionAbout_triggered() -{ - AboutDialog *about = new AboutDialog(this); - about->exec(); -} - -void QGLInfoWindow::on_actionRun_FPS_Test_triggered() -{ - fps = new FPSWidget(0); - fps->setGeometry(rect()); - fps->move(this->pos()); - connect(fps, SIGNAL(fps(int)), - ui->fpsLcdNumber, SLOT(display(int))); - ui->fpsWidget->setVisible(true); - fps->show(); -} - -void QGLInfoWindow::on_actionCopy_triggered() -{ - if (ui->textBrowser->textCursor().hasSelection()) { - ui->textBrowser->copy(); - } - else { - ui->textBrowser->selectAll(); - ui->textBrowser->copy(); - - QTextCursor tc(ui->textBrowser->textCursor()); - tc.clearSelection(); - tc.setPosition(0); - ui->textBrowser->setTextCursor(tc); - } -} diff --git a/util/qt3d/qglinfo/qglinfowindow.h b/util/qt3d/qglinfo/qglinfowindow.h deleted file mode 100644 index 84f7d41a..00000000 --- a/util/qt3d/qglinfo/qglinfowindow.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtQuick3D module of the Qt Toolkit. -** -** $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$ -** -****************************************************************************/ - -#ifndef QGLINFOWINDOW_H -#define QGLINFOWINDOW_H - -#include <QMainWindow> - -namespace Ui { - class QGLInfoWindow; -} - -class QGLInfo; -class FPSWidget; - -class QGLInfoWindow : public QMainWindow { - Q_OBJECT -public: - QGLInfoWindow(QWidget *parent = 0); - ~QGLInfoWindow(); -public slots: - void on_actionQuit_triggered(); - void on_action_Save_As_triggered(); - -protected: - void changeEvent(QEvent *e); - -private: - Ui::QGLInfoWindow *ui; - QGLInfo *info; - FPSWidget *fps; - -private slots: - void on_actionRun_FPS_Test_triggered(); - void on_actionAbout_triggered(); - void on_actionCopy_triggered(); -}; - -#endif // QGLINFOWINDOW_H diff --git a/util/qt3d/qglinfo/qglinfowindow.ui b/util/qt3d/qglinfo/qglinfowindow.ui deleted file mode 100644 index 67723d35..00000000 --- a/util/qt3d/qglinfo/qglinfowindow.ui +++ /dev/null @@ -1,218 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>QGLInfoWindow</class> - <widget class="QMainWindow" name="QGLInfoWindow"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>555</width> - <height>584</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="windowTitle"> - <string>QGLInfo Window</string> - </property> - <widget class="QWidget" name="centralwidget"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QScrollArea" name="scrollArea"> - <property name="widgetResizable"> - <bool>true</bool> - </property> - <widget class="QWidget" name="scrollAreaWidgetContents"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>527</width> - <height>420</height> - </rect> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QTextBrowser" name="textBrowser"/> - </item> - </layout> - </widget> - </widget> - </item> - <item> - <widget class="QWidget" name="fpsWidget" native="true"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="fpsLabel"> - <property name="text"> - <string>Frames Per Second:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </item> - <item> - <widget class="QLCDNumber" name="fpsLcdNumber"> - <property name="layoutDirection"> - <enum>Qt::RightToLeft</enum> - </property> - <property name="frameShape"> - <enum>QFrame::Panel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="lineWidth"> - <number>1</number> - </property> - <property name="midLineWidth"> - <number>3</number> - </property> - <property name="segmentStyle"> - <enum>QLCDNumber::Flat</enum> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>301</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QWidget" name="buttonsWidget" native="true"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QPushButton" name="saveAsPushButton"> - <property name="text"> - <string>Save As</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="runFPSTestPushButton"> - <property name="text"> - <string> FPS Test</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>241</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="quitPushButton"> - <property name="text"> - <string>Quit</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - <widget class="QMenuBar" name="menubar"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>555</width> - <height>22</height> - </rect> - </property> - <widget class="QMenu" name="menuFile"> - <property name="title"> - <string>File</string> - </property> - <addaction name="action_Save_As"/> - <addaction name="actionQuit"/> - </widget> - <widget class="QMenu" name="menuEdit"> - <property name="title"> - <string>Edit</string> - </property> - <addaction name="actionCopy"/> - </widget> - <widget class="QMenu" name="menuAbout"> - <property name="title"> - <string>Help</string> - </property> - <addaction name="actionAbout"/> - </widget> - <widget class="QMenu" name="menuView"> - <property name="title"> - <string>View</string> - </property> - <addaction name="actionRun_FPS_Test"/> - </widget> - <addaction name="menuFile"/> - <addaction name="menuEdit"/> - <addaction name="menuView"/> - <addaction name="menuAbout"/> - </widget> - <action name="action_Save_As"> - <property name="text"> - <string>&Save As</string> - </property> - <property name="shortcut"> - <string>Ctrl+S</string> - </property> - </action> - <action name="actionQuit"> - <property name="text"> - <string>&Quit</string> - </property> - <property name="shortcut"> - <string>Ctrl+Q</string> - </property> - </action> - <action name="actionCopy"> - <property name="text"> - <string>&Copy</string> - </property> - <property name="shortcut"> - <string>Ctrl+C</string> - </property> - </action> - <action name="actionAbout"> - <property name="text"> - <string>About</string> - </property> - </action> - <action name="actionRun_FPS_Test"> - <property name="text"> - <string>&Run FPS Test</string> - </property> - <property name="shortcut"> - <string>Ctrl+R</string> - </property> - </action> - </widget> - <resources/> - <connections/> -</ui> diff --git a/util/qt3d/qglinfo/qtquick3d.ico b/util/qt3d/qglinfo/qtquick3d.ico Binary files differdeleted file mode 100644 index b3b85e37..00000000 --- a/util/qt3d/qglinfo/qtquick3d.ico +++ /dev/null diff --git a/util/qt3d/qt3d.pro b/util/qt3d/qt3d.pro deleted file mode 100644 index 73438b6c..00000000 --- a/util/qt3d/qt3d.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -contains(QT_CONFIG, widgets): SUBDIRS += qglinfo |
