Changeset 106799 in webkit


Ignore:
Timestamp:
Feb 6, 2012 5:09:27 AM (12 years ago)
Author:
jocelyn.turcotte@nokia.com
Message:

[Qt] Don't version QtWebKit.experimental.
https://bugs.webkit.org/show_bug.cgi?id=77739

Reviewed by Tor Arne Vestbø.

Source/WebKit/qt:

We won't support previous versions of the experimental API.

  • declarative/experimental/plugin.cpp:

Source/WebKit2:

  • UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_itemSelector.qml:
  • UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml:
  • UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml:
  • UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml:
  • UIProcess/API/qt/tests/qmltests/WebView/tst_download.qml:
  • UIProcess/API/qt/tests/qmltests/WebView/tst_geopermission.qml:
  • UIProcess/API/qt/tests/qmltests/WebView/tst_javaScriptDialogs.qml:
  • UIProcess/API/qt/tests/qmltests/WebView/tst_navigationHistory.qml:
  • UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml:

Tools:

  • MiniBrowser/qt/qml/BrowserWindow.qml:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/qt/ChangeLog

    r106783 r106799  
     12012-02-03  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        [Qt] Don't version QtWebKit.experimental.
     4        https://bugs.webkit.org/show_bug.cgi?id=77739
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        We won't support previous versions of the experimental API.
     9
     10        * declarative/experimental/plugin.cpp:
     11
    1122012-02-05  Gavin Barraclough  <barraclough@apple.com>
    213
  • trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp

    r104193 r106799  
    4949        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit.experimental"));
    5050
    51         qmlRegisterUncreatableType<QWebDownloadItem>(uri, 3, 0, "DownloadItem", QObject::tr("Cannot create separate instance of DownloadItem"));
    52         qmlRegisterUncreatableType<QWebNavigationListModel>(uri, 3, 0, "NavigationListModel", QObject::tr("Cannot create separate instance of NavigationListModel"));
    53         qmlRegisterUncreatableType<QWebNavigationHistory>(uri, 3, 0, "NavigationHistory", QObject::tr("Cannot create separate instance of NavigationHistory"));
    54         qmlRegisterExtendedType<QQuickWebView, QQuickWebViewExperimentalExtension>(uri, 3, 0, "WebView");
    55         qmlRegisterUncreatableType<QQuickWebViewExperimental>(uri, 3, 0, "WebViewExperimental",
     51        qmlRegisterUncreatableType<QWebDownloadItem>(uri, 1, 0, "DownloadItem", QObject::tr("Cannot create separate instance of DownloadItem"));
     52        qmlRegisterUncreatableType<QWebNavigationListModel>(uri, 1, 0, "NavigationListModel", QObject::tr("Cannot create separate instance of NavigationListModel"));
     53        qmlRegisterUncreatableType<QWebNavigationHistory>(uri, 1, 0, "NavigationHistory", QObject::tr("Cannot create separate instance of NavigationHistory"));
     54        qmlRegisterExtendedType<QQuickWebView, QQuickWebViewExperimentalExtension>(uri, 1, 0, "WebView");
     55        qmlRegisterUncreatableType<QQuickWebViewExperimental>(uri, 1, 0, "WebViewExperimental",
    5656            QObject::tr("Cannot create separate instance of WebViewExperimental"));
    57         qmlRegisterUncreatableType<QWebViewportInfo>(uri, 3, 0, "QWebViewportInfo",
     57        qmlRegisterUncreatableType<QWebViewportInfo>(uri, 1, 0, "QWebViewportInfo",
    5858            QObject::tr("Cannot create separate instance of QWebViewportInfo"));
    59         qmlRegisterType<QQuickUrlSchemeDelegate>(uri, 3, 0, "UrlSchemeDelegate");
    60         qmlRegisterUncreatableType<QQuickNetworkRequest>(uri, 3, 0, "NetworkRequest",
     59        qmlRegisterType<QQuickUrlSchemeDelegate>(uri, 1, 0, "UrlSchemeDelegate");
     60        qmlRegisterUncreatableType<QQuickNetworkRequest>(uri, 1, 0, "NetworkRequest",
    6161            QObject::tr("NetworkRequest should not be created from QML"));
    62         qmlRegisterUncreatableType<QQuickNetworkReply>(uri, 3, 0, "NetworkReply",
     62        qmlRegisterUncreatableType<QQuickNetworkReply>(uri, 1, 0, "NetworkReply",
    6363            QObject::tr("NetworkReply should not be created from QML"));
    6464    }
  • trunk/Source/WebKit2/ChangeLog

    r106788 r106799  
     12012-02-03  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        [Qt] Don't version QtWebKit.experimental.
     4        https://bugs.webkit.org/show_bug.cgi?id=77739
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_itemSelector.qml:
     9        * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml:
     10        * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml:
     11        * UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml:
     12        * UIProcess/API/qt/tests/qmltests/WebView/tst_download.qml:
     13        * UIProcess/API/qt/tests/qmltests/WebView/tst_geopermission.qml:
     14        * UIProcess/API/qt/tests/qmltests/WebView/tst_javaScriptDialogs.qml:
     15        * UIProcess/API/qt/tests/qmltests/WebView/tst_navigationHistory.qml:
     16        * UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml:
     17
    1182012-02-06  Carlos Garcia Campos  <cgarcia@igalia.com>
    219
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_itemSelector.qml

    r106658 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55
    66// FIXME: Moved to Desktop tests because we want to have mouseClick() to open the <select> tag. We can move it back
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml

    r106658 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55
    66Item {
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml

    r106658 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55
    66Item {
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml

    r105991 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55import Test 1.0
    66
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_download.qml

    r102959 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55
    66WebView {
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_geopermission.qml

    r102499 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55
    66WebView {
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_javaScriptDialogs.qml

    r102499 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55
    66WebView {
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_navigationHistory.qml

    r102597 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55
    66WebView {
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml

    r104567 r106799  
    22import QtTest 1.0
    33import QtWebKit 3.0
    4 import QtWebKit.experimental 3.0
     4import QtWebKit.experimental 1.0
    55
    66Item {
  • trunk/Tools/ChangeLog

    r106788 r106799  
     12012-02-03  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        [Qt] Don't version QtWebKit.experimental.
     4        https://bugs.webkit.org/show_bug.cgi?id=77739
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * MiniBrowser/qt/qml/BrowserWindow.qml:
     9
    1102012-02-06  Carlos Garcia Campos  <cgarcia@igalia.com>
    211
  • trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml

    r106231 r106799  
    2929import QtQuick 2.0
    3030import QtWebKit 3.0
    31 import QtWebKit.experimental 3.0
     31import QtWebKit.experimental 1.0
    3232
    3333Rectangle {
Note: See TracChangeset for help on using the changeset viewer.