diff options
author | Alan Alpert <416365416c@gmail.com> | 2013-12-03 08:41:04 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-04 11:24:42 +0100 |
commit | 4f08859e812681b67cc197e997102fa81d21ded4 (patch) | |
tree | 07caea988ffa583923c84ac0052c8b7a5a891533 /src/qml/qml/qqmlabstracturlinterceptor_p.h | |
parent | d5fd163f325329de5361a3f0018e23ff342d73a1 (diff) |
Revert "Revert ffaf39e9a7f11d4e2800b3b37160a2a952795614"
This reverts commit 27052dcad9810869a9065da4c06e9f14379411d7.
While the additional flexibility would be nice, I've been reminded that
we already did commit to it back in July.
Change-Id: Iaf990dda98ee46eb028b4737bdeeafd050d9513f
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'src/qml/qml/qqmlabstracturlinterceptor_p.h')
-rw-r--r-- | src/qml/qml/qqmlabstracturlinterceptor_p.h | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/src/qml/qml/qqmlabstracturlinterceptor_p.h b/src/qml/qml/qqmlabstracturlinterceptor_p.h deleted file mode 100644 index 471c837eed..0000000000 --- a/src/qml/qml/qqmlabstracturlinterceptor_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Research In Motion. -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQml 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 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQMLABSTRACTURLINTERCEPTOR_H -#define QQMLABSTRACTURLINTERCEPTOR_H - -#include <QtCore/qurl.h> -#include <private/qtqmlglobal_p.h> - -QT_BEGIN_NAMESPACE - -class Q_QML_PRIVATE_EXPORT QQmlAbstractUrlInterceptor -{ - Q_FLAGS(InterceptionPoint) -public: - enum DataType { //Matches QQmlDataBlob::Type - QmlFile = 0, - JavaScriptFile = 1, - QmldirFile = 2, - UrlString = 0x1000 - }; - - QQmlAbstractUrlInterceptor() {} - virtual ~QQmlAbstractUrlInterceptor() {} - virtual QUrl intercept(const QUrl &path, DataType type) = 0; -}; - -QT_END_NAMESPACE -#endif |