Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5194 from jherico/qml_warnings

Browse source 
Removing qml warnings
This commit is contained in:
Brad Hefta-Gaub 2015-06-24 15:42:36 -07:00
commit 1cb7d0c1a5
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/qml/Stats.qml
View file

@ -12,11 +12,6 @@ Item {
implicitWidth: row.width implicitWidth: row.width
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
readonly property int sTATS_GENERAL_MIN_WIDTH: 165
readonly property int sTATS_PING_MIN_WIDTH: 190
readonly property int sTATS_GEO_MIN_WIDTH: 240
readonly property int sTATS_OCTREE_MIN_WIDTH: 410
readonly property int fontSize: 12 readonly property int fontSize: 12
readonly property string fontColor: "white" readonly property string fontColor: "white"
readonly property string bgColor: "#99333333" readonly property string bgColor: "#99333333"
@ -37,7 +32,6 @@ Item {
Column { Column {
id: generalCol id: generalCol
spacing: 4; x: 4; y: 4; spacing: 4; x: 4; y: 4;
width: sTATS_GENERAL_MIN_WIDTH
Text { Text {
color: root.fontColor; color: root.fontColor;
font.pixelSize: root.fontSize font.pixelSize: root.fontSize
@ -78,7 +72,6 @@ Item {
Column { Column {
id: pingCol id: pingCol
spacing: 4; x: 4; y: 4; spacing: 4; x: 4; y: 4;
width: sTATS_PING_MIN_WIDTH
Text { Text {
color: root.fontColor color: root.fontColor
font.pixelSize: root.fontSize font.pixelSize: root.fontSize
@ -114,7 +107,6 @@ Item {
Column { Column {
id: geoCol id: geoCol
spacing: 4; x: 4; y: 4; spacing: 4; x: 4; y: 4;
width: sTATS_GEO_MIN_WIDTH
Text { Text {
color: root.fontColor; color: root.fontColor;
font.pixelSize: root.fontSize font.pixelSize: root.fontSize
@ -157,7 +149,6 @@ Item {
Column { Column {
id: octreeCol id: octreeCol
spacing: 4; x: 4; y: 4; spacing: 4; x: 4; y: 4;
width: sTATS_OCTREE_MIN_WIDTH
Text { Text {
color: root.fontColor; color: root.fontColor;
font.pixelSize: root.fontSize font.pixelSize: root.fontSize

2
interface/src/ui/Stats.h
View file

@ -29,7 +29,7 @@ class Stats : public QQuickItem {
HIFI_QML_DECL HIFI_QML_DECL
Q_PROPERTY(bool expanded READ isExpanded WRITE setExpanded NOTIFY expandedChanged) Q_PROPERTY(bool expanded READ isExpanded WRITE setExpanded NOTIFY expandedChanged)
Q_PROPERTY(bool timingExpanded READ isTimingExpanded NOTIFY timingExpandedChanged) Q_PROPERTY(bool timingExpanded READ isTimingExpanded NOTIFY timingExpandedChanged)
Q_PROPERTY(QString monospaceFont READ monospaceFont) Q_PROPERTY(QString monospaceFont READ monospaceFont CONSTANT)
STATS_PROPERTY(int, serverCount, 0) STATS_PROPERTY(int, serverCount, 0)
STATS_PROPERTY(int, framerate, 0) STATS_PROPERTY(int, framerate, 0)