diff options
| author | Adam Kallai <kadam@inf.u-szeged.hu> | 2016-08-04 12:44:23 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2016-08-20 08:26:45 +0000 |
| commit | e8d4115c43665fb6e567e639fce3924082ae6450 (patch) | |
| tree | 3928d0eeda7b552fd0b9e6cda94056bad67cc2a0 | |
| parent | baeb20b2e720f5c683cf3810116d827e1561c4b2 (diff) | |
Add Qt Quick Controls2 support for ToolTip
Change-Id: I11b4990aea218a5cfd5d2365a9af0162ec9b500a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | src/webengine/ui2/ToolTip.qml | 45 | ||||
| -rw-r--r-- | src/webengine/ui2/ui2.pro | 1 |
2 files changed, 46 insertions, 0 deletions
diff --git a/src/webengine/ui2/ToolTip.qml b/src/webengine/ui2/ToolTip.qml new file mode 100644 index 000000000..91645a0f4 --- /dev/null +++ b/src/webengine/ui2/ToolTip.qml @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick.Controls 2.0 + +ToolTip { + delay: 1000 + timeout: 1500 +} diff --git a/src/webengine/ui2/ui2.pro b/src/webengine/ui2/ui2.pro index 612999929..4628d40b5 100644 --- a/src/webengine/ui2/ui2.pro +++ b/src/webengine/ui2/ui2.pro @@ -11,6 +11,7 @@ QML_FILES += \ Menu.qml \ MenuItem.qml \ MenuSeparator.qml \ + ToolTip.qml \ information.png \ question.png |