summaryrefslogtreecommitdiffstats
path: root/mkspecs/wince50standard-armv4i-msvc2005
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-26 23:05:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-26 23:05:25 (GMT)
commitaa8c77e0ad915e9505675adb9294403fc4f3ea4f (patch)
tree3ecb9434f1ed79b358c475d5b6ca5d47e66be1e5 /mkspecs/wince50standard-armv4i-msvc2005
parent9639f0ee4728036a8121674dc49e0c4338127075 (diff)
parent88c1670a658d55257d50181d741afe562e44344b (diff)
downloadQt-aa8c77e0ad915e9505675adb9294403fc4f3ea4f.zip
Qt-aa8c77e0ad915e9505675adb9294403fc4f3ea4f.tar.gz
Qt-aa8c77e0ad915e9505675adb9294403fc4f3ea4f.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (689 commits) Fixed hslHue / hslHueF returning the wrong value for achromatic QColors. Added scrollbars support to the Linguist form preview. interpret backslash escaping of quotes in split_arg_list() cleanup split_arg_list() some more slightly reorganize split_arg_list() remove the somewhat bizarre unquoting of the last argument in split_arg_list() remove the completely insane quote nesting from split_value_list() Fixed spelling. Various small fixes for the QScroller examples Use qreal everywhere to avoid double/float errors on embedded platforms. Fixed overshooting with a very low start velocity. Fix Xrandr DPI calculation for NVidia TwinView. Review and improve scroller documentation Improve overshooting behaviour Add comctl32 v6 assembly dependency to applications only (not libraries) QPainterPath: Ignore calls with NaN/Infinite parameters Doc: Fixing typo Added initial set of .pkg files for Symbian SIS generation Allow hard-coding the Unix temp path QtScript: add more tests to QObject binding ...
Diffstat (limited to 'mkspecs/wince50standard-armv4i-msvc2005')
-rw-r--r--mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
index ef9f2cb..0f05da6 100644
--- a/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
+++ b/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**