diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 14:01:35 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-23 14:45:03 +0200 |
| commit | 790aef362fd195adf97d8c780a7cbbbade27d51f (patch) | |
| tree | 8be464687ab21806cfe9f7ada27098b563aa41b2 /examples/webkit/webkit-guide/anim_pulse.htm | |
| parent | 9720efbd1035c2e939b0581163e6d804c713dd96 (diff) | |
| parent | 07475c662eb73c833da2d461b8ef2702ca1e2cfb (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
configure
src/corelib/global/qglobal.h
src/tools/qdoc/node.cpp
src/tools/qdoc/qdocdatabase.cpp
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
tools/configure/configureapp.cpp
Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
Diffstat (limited to 'examples/webkit/webkit-guide/anim_pulse.htm')
| -rw-r--r-- | examples/webkit/webkit-guide/anim_pulse.htm | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/examples/webkit/webkit-guide/anim_pulse.htm b/examples/webkit/webkit-guide/anim_pulse.htm deleted file mode 100644 index 6e354cf229..0000000000 --- a/examples/webkit/webkit-guide/anim_pulse.htm +++ /dev/null @@ -1,72 +0,0 @@ -<!-- -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples 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 The Qt Company Ltd 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$ -** ---> - -<!DOCTYPE html> -<html> -<head> -<meta name='viewport' content='width=device-width' /> -<title>Animated Pulse</title> -<link href='css/anim_pulse.css' type='text/css' rel='stylesheet'/> -</head> -<body> -<section> -<article> -<nav> -<a href="#a" id="a"></a> -<a href="#b" id="b"></a> -<a href="#c" id="c"></a> -<a href="#d" id="d"></a> -<a href="#e" id="e"></a> -<a href="#f" id="f"></a> -<span class="force"> </span> -</nav> -<h3>Animated Pulse</h3> -<p> -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec feugiat -gravida viverra. Vivamus ipsum felis, cursus sed venenatis nec, tempus -ac tellus. Praesent luctus, risus eu vestibulum mollis, arcu mauris -mollis ante, id mollis risus lectus ornare nisl. Aenean elementum arcu -sed nibh faucibus pellentesque. Aliquam erat volutpat. -</p> -</article> -</section> -<script src="js/mobile.js"></script> -</body> -</html> |