summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorFabien Freling <fabien.freling@nokia.com>2010-02-19 12:27:44 (GMT)
committerFabien Freling <fabien.freling@nokia.com>2010-02-19 12:27:44 (GMT)
commit0ce2313b897fdd5d0a3529df9b5a9b3bd434e120 (patch)
tree4fae44e75e53085fc7ec40d6e6f6f2b28e01edbd /mkspecs
parentda1d0f7d34b7acdd4e38a8940279d9255eb15dc5 (diff)
parent8c1dc03e611cea5bc942cbef0ca94c86efe91426 (diff)
downloadQt-0ce2313b897fdd5d0a3529df9b5a9b3bd434e120.zip
Qt-0ce2313b897fdd5d0a3529df9b5a9b3bd434e120.tar.gz
Qt-0ce2313b897fdd5d0a3529df9b5a9b3bd434e120.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/linux-g++-x11egl/qplatformdefs.h2
-rw-r--r--mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h2
-rw-r--r--mkspecs/unsupported/qws/qnx-641/qplatformdefs.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/linux-g++-x11egl/qplatformdefs.h b/mkspecs/linux-g++-x11egl/qplatformdefs.h
index 1430916..dd3b9a1 100644
--- a/mkspecs/linux-g++-x11egl/qplatformdefs.h
+++ b/mkspecs/linux-g++-x11egl/qplatformdefs.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h b/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
index 60e0f5e..b0551e5 100644
--- a/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
+++ b/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
index af04086..5912a51 100644
--- a/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
+++ b/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**