Mercurial Repositories > eric / changeset

--- a/WebBrowser/WebBrowserWindow.py	Sun May 01 16:41:08 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Sun May 01 16:58:52 2016 +0200
@@ -53,7 +53,6 @@
 from .data import icons_rc          # __IGNORE_WARNING__
 from .data import html_rc           # __IGNORE_WARNING__
 from .data import javascript_rc     # __IGNORE_WARNING__
-from .data import qml_rc            # __IGNORE_WARNING__
 
 
 from .Tools import Scripts, WebBrowserTools, WebIconProvider

--- a/WebBrowser/data/qml.qrc	Sun May 01 16:41:08 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-<qresource>
-  <file>qml/thumbnailer.qml</file>
-</qresource>
-</RCC>

--- a/WebBrowser/data/qml/thumbnailer.qml	Sun May 01 16:41:08 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-import QtQuick 2.2
-import QtWebEngine 1.0
-
-WebEngineView {
-    width: 1920
-    height: 1080
-
-    onLoadingChanged: {
-        if (loadRequest.status == WebEngineView.LoadStartedStatus)
-            return;
-
-        var ok = loadRequest.status == WebEngineView.LoadSucceededStatus;
-        thumbnailer.createThumbnail(ok);
-    }
-}

--- a/WebBrowser/data/qml_rc.py	Sun May 01 16:41:08 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Resource object code
-#
-# Created by: The Resource Compiler for PyQt5 (Qt v5.4.1)
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt5 import QtCore
-
-qt_resource_data = b"\
-\x00\x00\x01\x48\
-\x69\
-\x6d\x70\x6f\x72\x74\x20\x51\x74\x51\x75\x69\x63\x6b\x20\x32\x2e\
-\x32\x0a\x69\x6d\x70\x6f\x72\x74\x20\x51\x74\x57\x65\x62\x45\x6e\
-\x67\x69\x6e\x65\x20\x31\x2e\x30\x0a\x0a\x57\x65\x62\x45\x6e\x67\
-\x69\x6e\x65\x56\x69\x65\x77\x20\x7b\x0a\x20\x20\x20\x20\x77\x69\
-\x64\x74\x68\x3a\x20\x31\x39\x32\x30\x0a\x20\x20\x20\x20\x68\x65\
-\x69\x67\x68\x74\x3a\x20\x31\x30\x38\x30\x0a\x0a\x20\x20\x20\x20\
-\x6f\x6e\x4c\x6f\x61\x64\x69\x6e\x67\x43\x68\x61\x6e\x67\x65\x64\
-\x3a\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x69\x66\x20\x28\
-\x6c\x6f\x61\x64\x52\x65\x71\x75\x65\x73\x74\x2e\x73\x74\x61\x74\
-\x75\x73\x20\x3d\x3d\x20\x57\x65\x62\x45\x6e\x67\x69\x6e\x65\x56\
-\x69\x65\x77\x2e\x4c\x6f\x61\x64\x53\x74\x61\x72\x74\x65\x64\x53\
-\x74\x61\x74\x75\x73\x29\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\
-\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x3b\x0a\x0a\x20\x20\x20\x20\
-\x20\x20\x20\x20\x76\x61\x72\x20\x6f\x6b\x20\x3d\x20\x6c\x6f\x61\
-\x64\x52\x65\x71\x75\x65\x73\x74\x2e\x73\x74\x61\x74\x75\x73\x20\
-\x3d\x3d\x20\x57\x65\x62\x45\x6e\x67\x69\x6e\x65\x56\x69\x65\x77\
-\x2e\x4c\x6f\x61\x64\x53\x75\x63\x63\x65\x65\x64\x65\x64\x53\x74\
-\x61\x74\x75\x73\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\
-\x75\x6d\x62\x6e\x61\x69\x6c\x65\x72\x2e\x63\x72\x65\x61\x74\x65\
-\x54\x68\x75\x6d\x62\x6e\x61\x69\x6c\x28\x6f\x6b\x29\x3b\x0a\x20\
-\x20\x20\x20\x7d\x0a\x7d\x0a\
-"
-
-qt_resource_name = b"\
-\x00\x03\
-\x00\x00\x78\x3c\
-\x00\x71\
-\x00\x6d\x00\x6c\
-\x00\x0f\
-\x0a\xb6\x34\x5c\
-\x00\x74\
-\x00\x68\x00\x75\x00\x6d\x00\x62\x00\x6e\x00\x61\x00\x69\x00\x6c\x00\x65\x00\x72\x00\x2e\x00\x71\x00\x6d\x00\x6c\
-"
-
-qt_resource_struct = b"\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
-\x00\x00\x00\x0c\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-"
-
-def qInitResources():
-    QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-def qCleanupResources():
-    QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-qInitResources()

--- a/eric6.e4p	Sun May 01 16:41:08 2016 +0200
+++ b/eric6.e4p	Sun May 01 16:58:52 2016 +0200
@@ -1465,7 +1465,6 @@
     <Source>WebBrowser/data/html_rc.py</Source>
     <Source>WebBrowser/data/icons_rc.py</Source>
     <Source>WebBrowser/data/javascript_rc.py</Source>
-    <Source>WebBrowser/data/qml_rc.py</Source>
     <Source>__init__.py</Source>
     <Source>cleanupSource.py</Source>
     <Source>compileUiFiles.py</Source>
@@ -1952,7 +1951,6 @@
     <Resource>WebBrowser/data/html.qrc</Resource>
     <Resource>WebBrowser/data/icons.qrc</Resource>
     <Resource>WebBrowser/data/javascript.qrc</Resource>
-    <Resource>WebBrowser/data/qml.qrc</Resource>
   </Resources>
   <Interfaces/>
   <Others>
@@ -2094,7 +2092,6 @@
     <Other>WebBrowser/data/javascript/jquery-ui.js</Other>
     <Other>WebBrowser/data/javascript/jquery.js</Other>
     <Other>WebBrowser/data/javascript/qwebchannel.js</Other>
-    <Other>WebBrowser/data/qml/thumbnailer.qml</Other>
     <Other>changelog</Other>
     <Other>default.e4k</Other>
     <Other>default_Mac.e4k</Other>