centralize and fixup example sources install targets
This follows suit with aeb036e in qtbase. Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Joerg Bornemann
committed by
The Qt Project
The Qt Project
parent
90c8ba233b
commit
6b4994c265
@@ -0,0 +1,69 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, 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, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia 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.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "performancemonitor.h"
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
|
||||
bool parseArgument(const QString &arg, State &state)
|
||||
{
|
||||
bool result = false;
|
||||
if ("-log-perf" == arg) {
|
||||
state.logging = true;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-no-log-perf" == arg) {
|
||||
state.logging = false;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-show-perf" == arg) {
|
||||
state.visible = true;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-hide-perf" == arg) {
|
||||
state.visible = false;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, 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, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia 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.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef PERFORMANCEMONITOR_H
|
||||
#define PERFORMANCEMONITOR_H
|
||||
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
struct State {
|
||||
bool valid;
|
||||
bool logging;
|
||||
bool visible;
|
||||
|
||||
State() : valid(true), logging(false), visible(true) { }
|
||||
State(bool l, bool v) : valid(true), logging(l), visible(v) { }
|
||||
bool operator==(const State &other) const
|
||||
{ return logging == other.logging && visible == other.visible; }
|
||||
bool operator!=(const State &other) const
|
||||
{ return logging != other.logging || visible != other.visible; }
|
||||
};
|
||||
|
||||
bool parseArgument(const QString &arg, State &state);
|
||||
}
|
||||
|
||||
#endif // PERFORMANCEMONITOR_H
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
INCLUDEPATH += $$PWD
|
||||
HEADERS += $$PWD/performancemonitor.h
|
||||
SOURCES += $$PWD/performancemonitor.cpp
|
||||
DEFINES += PERFORMANCEMONITOR_SUPPORT
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, 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, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia 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.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "frequencymonitor.h"
|
||||
#include "performancemonitor.h"
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
|
||||
void qmlRegisterTypes()
|
||||
{
|
||||
FrequencyMonitor::qmlRegisterType();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, 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, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia 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.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef PERFORMANCEMONITORDECLARATIVE_H
|
||||
#define PERFORMANCEMONITORDECLARATIVE_H
|
||||
|
||||
#include "performancemonitor.h"
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
void qmlRegisterTypes();
|
||||
}
|
||||
|
||||
#endif // PERFORMANCEMONITORDECLARATIVE_H
|
||||
@@ -0,0 +1,5 @@
|
||||
include($$PWD/../frequencymonitor/frequencymonitordeclarative.pri)
|
||||
include($$PWD/performancemonitor.pri)
|
||||
|
||||
HEADERS += $$PWD/performancemonitordeclarative.h
|
||||
SOURCES += $$PWD/performancemonitordeclarative.cpp
|
||||
@@ -0,0 +1,141 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, 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, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia 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.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
property bool logging: true
|
||||
property bool displayed: true
|
||||
property bool videoActive
|
||||
property int margins: 5
|
||||
property bool enabled: true
|
||||
|
||||
color: "transparent"
|
||||
|
||||
// This should ensure that the monitor is on top of all other content
|
||||
z: 999
|
||||
|
||||
Column {
|
||||
id: column
|
||||
anchors {
|
||||
fill: root
|
||||
margins: 10
|
||||
}
|
||||
spacing: 10
|
||||
}
|
||||
|
||||
QtObject {
|
||||
id: d
|
||||
property Item qmlFrameRateItem: null
|
||||
property Item videoFrameRateItem: null
|
||||
}
|
||||
|
||||
Connections {
|
||||
id: videoFrameRateActiveConnections
|
||||
ignoreUnknownSignals: true
|
||||
onActiveChanged: root.videoActive = videoFrameRateActiveConnections.target.active
|
||||
}
|
||||
|
||||
states: [
|
||||
State {
|
||||
name: "hidden"
|
||||
PropertyChanges {
|
||||
target: root
|
||||
opacity: 0
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
transitions: [
|
||||
Transition {
|
||||
from: "*"
|
||||
to: "*"
|
||||
NumberAnimation {
|
||||
properties: "opacity"
|
||||
easing.type: Easing.OutQuart
|
||||
duration: 500
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
state: enabled ? "baseState" : "hidden"
|
||||
|
||||
function createQmlFrameRateItem() {
|
||||
var component = Qt.createComponent("../frequencymonitor/FrequencyItem.qml")
|
||||
if (component.status == Component.Ready)
|
||||
d.qmlFrameRateItem = component.createObject(column, { label: "QML frame rate",
|
||||
displayed: root.displayed,
|
||||
logging: root.logging
|
||||
})
|
||||
}
|
||||
|
||||
function createVideoFrameRateItem() {
|
||||
var component = Qt.createComponent("../frequencymonitor/FrequencyItem.qml")
|
||||
if (component.status == Component.Ready)
|
||||
d.videoFrameRateItem = component.createObject(column, { label: "Video frame rate",
|
||||
displayed: root.displayed,
|
||||
logging: root.logging
|
||||
})
|
||||
videoFrameRateActiveConnections.target = d.videoFrameRateItem
|
||||
}
|
||||
|
||||
|
||||
function init() {
|
||||
createQmlFrameRateItem()
|
||||
createVideoFrameRateItem()
|
||||
}
|
||||
|
||||
function videoFramePainted() {
|
||||
if (d.videoFrameRateItem)
|
||||
d.videoFrameRateItem.notify()
|
||||
}
|
||||
|
||||
function qmlFramePainted() {
|
||||
if (d.qmlFrameRateItem)
|
||||
d.qmlFrameRateItem.notify()
|
||||
}
|
||||
|
||||
onVideoActiveChanged: {
|
||||
if (d.videoFrameRateItem)
|
||||
d.videoFrameRateItem.active = root.videoActive
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user