summaryrefslogtreecommitdiffstats
path: root/demos/boxes
diff options
context:
space:
mode:
Diffstat (limited to 'demos/boxes')
-rw-r--r--demos/boxes/basic.fsh2
-rw-r--r--demos/boxes/basic.vsh2
-rw-r--r--demos/boxes/boxes.pro6
-rw-r--r--demos/boxes/dotted.fsh2
-rw-r--r--demos/boxes/fresnel.fsh2
-rw-r--r--demos/boxes/glass.fsh2
-rw-r--r--demos/boxes/glbuffers.cpp2
-rw-r--r--demos/boxes/glbuffers.h2
-rw-r--r--demos/boxes/glextensions.cpp2
-rw-r--r--demos/boxes/glextensions.h2
-rw-r--r--demos/boxes/gltrianglemesh.h2
-rw-r--r--demos/boxes/granite.fsh2
-rw-r--r--demos/boxes/main.cpp2
-rw-r--r--demos/boxes/marble.fsh2
-rw-r--r--demos/boxes/qtbox.cpp2
-rw-r--r--demos/boxes/qtbox.h2
-rw-r--r--demos/boxes/reflection.fsh2
-rw-r--r--demos/boxes/refraction.fsh2
-rw-r--r--demos/boxes/roundedbox.cpp2
-rw-r--r--demos/boxes/roundedbox.h2
-rw-r--r--demos/boxes/scene.cpp2
-rw-r--r--demos/boxes/scene.h2
-rw-r--r--demos/boxes/trackball.cpp2
-rw-r--r--demos/boxes/trackball.h2
-rw-r--r--demos/boxes/wood.fsh2
25 files changed, 28 insertions, 26 deletions
diff --git a/demos/boxes/basic.fsh b/demos/boxes/basic.fsh
index 0148f358e..8fdd0af85 100644
--- a/demos/boxes/basic.fsh
+++ b/demos/boxes/basic.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/basic.vsh b/demos/boxes/basic.vsh
index 2a462b6bc..1b16024f5 100644
--- a/demos/boxes/basic.vsh
+++ b/demos/boxes/basic.vsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/boxes.pro b/demos/boxes/boxes.pro
index 33f1f1428..59c91322d 100644
--- a/demos/boxes/boxes.pro
+++ b/demos/boxes/boxes.pro
@@ -42,6 +42,8 @@ wince*: {
}
win32-msvc* {
- QMAKE_CXXFLAGS += /Zm1200
- QMAKE_CFLAGS += /Zm1200
+ QMAKE_CXXFLAGS -= -Zm200
+ QMAKE_CFLAGS -= -Zm200
+ QMAKE_CXXFLAGS += -Zm1200
+ QMAKE_CFLAGS += -Zm1200
}
diff --git a/demos/boxes/dotted.fsh b/demos/boxes/dotted.fsh
index 071a2074f..8c251b46b 100644
--- a/demos/boxes/dotted.fsh
+++ b/demos/boxes/dotted.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/fresnel.fsh b/demos/boxes/fresnel.fsh
index 12588389c..938224d43 100644
--- a/demos/boxes/fresnel.fsh
+++ b/demos/boxes/fresnel.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/glass.fsh b/demos/boxes/glass.fsh
index bf0b3dee7..940bfdb43 100644
--- a/demos/boxes/glass.fsh
+++ b/demos/boxes/glass.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/glbuffers.cpp b/demos/boxes/glbuffers.cpp
index aa7cd4c4b..9699cea39 100644
--- a/demos/boxes/glbuffers.cpp
+++ b/demos/boxes/glbuffers.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h
index 7d5b5c5f8..901448f8b 100644
--- a/demos/boxes/glbuffers.h
+++ b/demos/boxes/glbuffers.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/glextensions.cpp b/demos/boxes/glextensions.cpp
index 14045b73a..cdf4ce98f 100644
--- a/demos/boxes/glextensions.cpp
+++ b/demos/boxes/glextensions.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/glextensions.h b/demos/boxes/glextensions.h
index 42a8c98e9..4560b49b3 100644
--- a/demos/boxes/glextensions.h
+++ b/demos/boxes/glextensions.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/gltrianglemesh.h b/demos/boxes/gltrianglemesh.h
index 7398982f0..da84fa860 100644
--- a/demos/boxes/gltrianglemesh.h
+++ b/demos/boxes/gltrianglemesh.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/granite.fsh b/demos/boxes/granite.fsh
index 75b4bd8a6..957d4ed2c 100644
--- a/demos/boxes/granite.fsh
+++ b/demos/boxes/granite.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/main.cpp b/demos/boxes/main.cpp
index 3ed671955..652436bc6 100644
--- a/demos/boxes/main.cpp
+++ b/demos/boxes/main.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/marble.fsh b/demos/boxes/marble.fsh
index 90133ee08..57ea38ebe 100644
--- a/demos/boxes/marble.fsh
+++ b/demos/boxes/marble.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/qtbox.cpp b/demos/boxes/qtbox.cpp
index e9c6dcf0c..e4a75fdb1 100644
--- a/demos/boxes/qtbox.cpp
+++ b/demos/boxes/qtbox.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/qtbox.h b/demos/boxes/qtbox.h
index a79c5a592..c1f6f79f8 100644
--- a/demos/boxes/qtbox.h
+++ b/demos/boxes/qtbox.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/reflection.fsh b/demos/boxes/reflection.fsh
index 4af6e64e8..2614b996e 100644
--- a/demos/boxes/reflection.fsh
+++ b/demos/boxes/reflection.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/refraction.fsh b/demos/boxes/refraction.fsh
index 732fc1ed0..5491bf839 100644
--- a/demos/boxes/refraction.fsh
+++ b/demos/boxes/refraction.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/roundedbox.cpp b/demos/boxes/roundedbox.cpp
index 8b304024e..e2c14cfb4 100644
--- a/demos/boxes/roundedbox.cpp
+++ b/demos/boxes/roundedbox.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/roundedbox.h b/demos/boxes/roundedbox.h
index 51f37db2f..9f600fc33 100644
--- a/demos/boxes/roundedbox.h
+++ b/demos/boxes/roundedbox.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
index 4be9eadca..daef32678 100644
--- a/demos/boxes/scene.cpp
+++ b/demos/boxes/scene.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h
index 5fcf9dddc..8c1a2c1de 100644
--- a/demos/boxes/scene.h
+++ b/demos/boxes/scene.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/trackball.cpp b/demos/boxes/trackball.cpp
index 178244081..0e847dba9 100644
--- a/demos/boxes/trackball.cpp
+++ b/demos/boxes/trackball.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/trackball.h b/demos/boxes/trackball.h
index ebf7f5afd..3afbb7840 100644
--- a/demos/boxes/trackball.h
+++ b/demos/boxes/trackball.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/boxes/wood.fsh b/demos/boxes/wood.fsh
index 8f4f9be7b..be5bd625d 100644
--- a/demos/boxes/wood.fsh
+++ b/demos/boxes/wood.fsh
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/