Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4

1 files changed, 39 insertions, 0 deletions

diff --git a/doc/global/includes-online/search.qdoc b/doc/global/includes-online/search.qdoc
new file mode 100644
index 0000000000..25c4563df6
--- /dev/null
+++ b/doc/global/includes-online/search.qdoc
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page search-results.html
+\title Search Results
+
+\raw HTML
+<link rel="stylesheet" type="text/css" href="style/gsc.css" />
+<script type="text/javascript">
+$(function(){ $(".title").append(": " + decodeURIComponent(location.search.split('=')[1]).substring(0,32)); });
+</script>
+<gcse:searchresults-only></gcse:searchresults-only>
+\endraw
+*/