summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-04-12 13:58:45 +0300
committerMika Salmela <mika.salmela@digia.com>2013-04-15 09:19:15 +0300
commitbb2beee9768b09a05138a9e8021716ebb72bfbc2 (patch)
tree9c91d4cc9f2f9d13b418c8f526b1aea8431ea107 /examples
parent28e8ada5e636a4c897358dfd5bad392135fd7f59 (diff)
Copyright changes
Change-Id: I71ca8308f318f9c869fe0d708e96b4855b9bae59 Change-Id: I71ca8308f318f9c869fe0d708e96b4855b9bae59 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/datavis3d/barchart/main.cpp5
-rw-r--r--examples/datavis3d/rainfall/main.cpp2
-rw-r--r--examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp4
-rw-r--r--examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.h4
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/engine.cpp2
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/engine.h4
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.cpp2
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.h4
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/main.cpp2
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/spectrum.h4
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.cpp2
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.h4
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/utils.cpp2
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/utils.h4
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/wavfile.cpp2
-rw-r--r--examples/datavis3d/spectrum/spectrumapp/wavfile.h4
16 files changed, 27 insertions, 24 deletions
diff --git a/examples/datavis3d/barchart/main.cpp b/examples/datavis3d/barchart/main.cpp
index 3e732494..0a311892 100644
--- a/examples/datavis3d/barchart/main.cpp
+++ b/examples/datavis3d/barchart/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 documentation of the Qt Toolkit.
@@ -111,6 +111,9 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart)
#ifndef CYCLE_THROUGH_THEMES
// Set bar colors
m_chart->setBarColor(QColor(Qt::gray), QColor(Qt::red), QColor(Qt::darkBlue));
+ m_chart->setLabelTransparency(Q3DBars::TransparencyFromTheme);
+#else
+ m_chart->setLabelTransparency(Q3DBars::TransparencyNone);
#endif
// Set preset camera position
diff --git a/examples/datavis3d/rainfall/main.cpp b/examples/datavis3d/rainfall/main.cpp
index 3b40b097..55f7155d 100644
--- a/examples/datavis3d/rainfall/main.cpp
+++ b/examples/datavis3d/rainfall/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 documentation of the Qt Toolkit.
diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
index ef216cb5..45aee653 100644
--- a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
+++ b/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
@@ -1,9 +1,9 @@
/***************************************************************************
**
-** 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.
+** This file is part of the examples of QtDataVis3D.
**
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Lesser General Public License as
diff --git a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.h
index 9a72fe66..2fb602de 100644
--- a/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.h
+++ b/examples/datavis3d/spectrum/3rdparty/fftreal/fftreal_wrapper.h
@@ -1,9 +1,9 @@
/***************************************************************************
**
-** 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.
+** This file is part of the examples of QtDataVis3D.
**
** This program is free software: you can redistribute it and/or modify
** it under the terms of the GNU Lesser General Public License as
diff --git a/examples/datavis3d/spectrum/spectrumapp/engine.cpp b/examples/datavis3d/spectrum/spectrumapp/engine.cpp
index e655cbcb..6f99c004 100644
--- a/examples/datavis3d/spectrum/spectrumapp/engine.cpp
+++ b/examples/datavis3d/spectrum/spectrumapp/engine.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/datavis3d/spectrum/spectrumapp/engine.h b/examples/datavis3d/spectrum/spectrumapp/engine.h
index 8ff69165..3d04e13b 100644
--- a/examples/datavis3d/spectrum/spectrumapp/engine.h
+++ b/examples/datavis3d/spectrum/spectrumapp/engine.h
@@ -1,9 +1,9 @@
/****************************************************************************
**
-** 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.
+** This file is part of the examples of QtDataVis3D.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.cpp b/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.cpp
index 6a7fd1fa..f4a4167b 100644
--- a/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.cpp
+++ b/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.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/datavis3d/spectrum/spectrumapp/frequencyspectrum.h b/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.h
index 10843ab3..e7ea2e53 100644
--- a/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.h
+++ b/examples/datavis3d/spectrum/spectrumapp/frequencyspectrum.h
@@ -1,9 +1,9 @@
/****************************************************************************
**
-** 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.
+** This file is part of the examples of QtDataVis3D.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/datavis3d/spectrum/spectrumapp/main.cpp b/examples/datavis3d/spectrum/spectrumapp/main.cpp
index 7dc94081..35572b18 100644
--- a/examples/datavis3d/spectrum/spectrumapp/main.cpp
+++ b/examples/datavis3d/spectrum/spectrumapp/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/datavis3d/spectrum/spectrumapp/spectrum.h b/examples/datavis3d/spectrum/spectrumapp/spectrum.h
index b51f0dfd..244a5892 100644
--- a/examples/datavis3d/spectrum/spectrumapp/spectrum.h
+++ b/examples/datavis3d/spectrum/spectrumapp/spectrum.h
@@ -1,9 +1,9 @@
/****************************************************************************
**
-** 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.
+** This file is part of the examples of QtDataVis3D.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.cpp b/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.cpp
index e1dbb25b..228ea145 100644
--- a/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.cpp
+++ b/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.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/datavis3d/spectrum/spectrumapp/spectrumanalyser.h b/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.h
index a5761951..50d4fb66 100644
--- a/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.h
+++ b/examples/datavis3d/spectrum/spectrumapp/spectrumanalyser.h
@@ -1,9 +1,9 @@
/****************************************************************************
**
-** 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.
+** This file is part of the examples of QtDataVis3D.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/datavis3d/spectrum/spectrumapp/utils.cpp b/examples/datavis3d/spectrum/spectrumapp/utils.cpp
index 92e2d6d1..723dd6f6 100644
--- a/examples/datavis3d/spectrum/spectrumapp/utils.cpp
+++ b/examples/datavis3d/spectrum/spectrumapp/utils.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/datavis3d/spectrum/spectrumapp/utils.h b/examples/datavis3d/spectrum/spectrumapp/utils.h
index daf5fae8..62215db5 100644
--- a/examples/datavis3d/spectrum/spectrumapp/utils.h
+++ b/examples/datavis3d/spectrum/spectrumapp/utils.h
@@ -1,9 +1,9 @@
/****************************************************************************
**
-** 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.
+** This file is part of the examples of QtDataVis3D.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/datavis3d/spectrum/spectrumapp/wavfile.cpp b/examples/datavis3d/spectrum/spectrumapp/wavfile.cpp
index dc1655c3..94a67155 100644
--- a/examples/datavis3d/spectrum/spectrumapp/wavfile.cpp
+++ b/examples/datavis3d/spectrum/spectrumapp/wavfile.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/datavis3d/spectrum/spectrumapp/wavfile.h b/examples/datavis3d/spectrum/spectrumapp/wavfile.h
index 97707136..a9bca7e1 100644
--- a/examples/datavis3d/spectrum/spectrumapp/wavfile.h
+++ b/examples/datavis3d/spectrum/spectrumapp/wavfile.h
@@ -1,9 +1,9 @@
/****************************************************************************
**
-** 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.
+** This file is part of the examples of QtDataVis3D.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows: