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: (119 commits)
  Lancelot: support for custom keys added to protocol. API cleanup.
  Designer: Allow promoted QWidget's to be buddies.
  Designer: Specify 'notr' attribute for buttongroup name.
  [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
  HTTP cacheing: do not store the date header with the resource
  Let's not write to the source buffer when blending argb32 on rgb16.
  Add support for -unset <prop> option to qmake.
  make -markuntranslated work without -idbased
  fix conditional on shell type
  Cocoa: p1 bug fix: fix auto test regressions
  Ensure shared network session deleted from correct thread
  Revert "Remove SIGBUS emission from QNetworkSession destruction."
  Image w/ PreserveAspectFit has its width changed once more than needed.
  fix QLocalSocket::isValid() on Windows
  Cocoa: p1 bug fix: revert use of subWindowStacking
  Not possible to enter negative values to widgets with numeric fields
  QmlViewer: Enable remote qml debugging
  QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
  Fix typos in QSharedPointer documentation.
  Improve Flickable dynamics and allow platform specific tweaking.
  ...

1 files changed, 93 insertions, 0 deletions

diff --git a/examples/webkit/webkit-guide/css/css3_scroll.css b/examples/webkit/webkit-guide/css/css3_scroll.css
new file mode 100755
index 0000000..ae37c34
--- /dev/null
+++ b/examples/webkit/webkit-guide/css/css3_scroll.css
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt WebKit module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+body {
+    background-color        : #aaaaaa;
+    font-family             : sans-serif;
+}
+
+h1,h2,h3,h4 {
+    margin-top              : 0.5em;
+    font-size               : 18px;
+    text-align              : center;
+}
+
+article {
+    background              : #ffffff;
+    border-radius           : 1.0em;
+    padding                 : 1.0em;
+    margin                  : 1.0em 0.5em 6.0em 0.5em;
+    min-height              : 50%;
+}
+
+pre {
+    font-weight             : bold;
+    font-family             : monospace;
+    padding                 : 1.0em 3em 1.0em 1.0em;
+    border                  : thin solid #aaaaaa;
+    border-radius           : 1.5em;
+    overflow-x              : auto;
+    background-image        : -webkit-gradient(linear,left center,right center,from(#ffffff),to(#777777));
+}
+
+pre::-webkit-scrollbar {
+    height                  : 3em;
+}
+
+pre::-webkit-scrollbar-button:increment {
+    background-image        : url(../img/icon_scroll-right.png);
+x    background-size        : contain;
+    background-repeat       : no-repeat;
+    width                   : 3em;
+    height                  : 3em;
+}
+
+pre::-webkit-scrollbar-button:decrement {
+    background-image        : url(../img/icon_scroll-left.png);
+    background-size         : contain;
+    background-repeat       : no-repeat;
+    width                   : 3em;
+    height                  : 3em;
+}
+
+pre::-webkit-scrollbar-track {
+    display                 : none;
+}
+