Fix #7287 (Building calibre fails on PyQt 4.8.0)

src/calibre/gui2/lrf_renderer/main.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
@@ -10,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,18 +20,10 @@
    <string>LRF Viewer</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../resources/images.qrc" >
+   <iconset>
     <normaloff>:/images/viewer.png</normaloff>:/images/viewer.png</iconset>
   </property>
   <widget class="QWidget" name="central_widget">
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>39</y>
-     <width>601</width>
-     <height>662</height>
-    </rect>
-   </property>
    <layout class="QVBoxLayout">
     <property name="margin">
      <number>0</number>
@@ -41,14 +34,6 @@
        <number>0</number>
       </property>
       <widget class="QWidget" name="viewer_page">
-       <property name="geometry" >
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>601</width>
-         <height>662</height>
-        </rect>
-       </property>
        <layout class="QGridLayout">
         <property name="margin">
          <number>0</number>
@@ -63,14 +48,6 @@
        </layout>
       </widget>
       <widget class="QWidget" name="bar_page">
-       <property name="geometry" >
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>601</width>
-         <height>701</height>
-        </rect>
-       </property>
        <layout class="QVBoxLayout">
         <item>
          <spacer>
@@ -141,14 +118,6 @@
    </layout>
   </widget>
   <widget class="QToolBar" name="tool_bar">
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>601</width>
-     <height>39</height>
-    </rect>
-   </property>
    <property name="windowTitle">
     <string>LRF Viewer toolbar</string>
    </property>
@@ -156,10 +125,10 @@
     <set>Qt::AllToolBarAreas</set>
    </property>
    <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
+    <enum>Qt::TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
-    <bool>true</bool>
+    <bool>false</bool>
    </attribute>
    <addaction name="action_back"/>
    <addaction name="action_forward"/>
@@ -173,7 +142,7 @@
   </widget>
   <action name="action_next_page">
    <property name="icon">
-    <iconset resource="../../../../resources/images.qrc" >
+    <iconset>
      <normaloff>:/images/next.png</normaloff>:/images/next.png</iconset>
    </property>
    <property name="text">
@@ -182,7 +151,7 @@
   </action>
   <action name="action_previous_page">
    <property name="icon">
-    <iconset resource="../../../../resources/images.qrc" >
+    <iconset>
      <normaloff>:/images/previous.png</normaloff>:/images/previous.png</iconset>
    </property>
    <property name="text">
@@ -191,7 +160,7 @@
   </action>
   <action name="action_back">
    <property name="icon">
-    <iconset resource="../../../../resources/images.qrc" >
+    <iconset>
      <normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
    </property>
    <property name="text">
@@ -200,7 +169,7 @@
   </action>
   <action name="action_forward">
    <property name="icon">
-    <iconset resource="../../../../resources/images.qrc" >
+    <iconset>
      <normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
    </property>
    <property name="text">
@@ -214,7 +183,7 @@
   </action>
   <action name="action_open_ebook">
    <property name="icon">
-    <iconset resource="../../../../resources/images.qrc" >
+    <iconset>
      <normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
    </property>
    <property name="text">
@@ -223,7 +192,7 @@
   </action>
   <action name="action_configure">
    <property name="icon">
-    <iconset resource="../../../../resources/images.qrc" >
+    <iconset>
      <normaloff>:/images/config.png</normaloff>:/images/config.png</iconset>
    </property>
    <property name="text">

src/calibre/gui2/viewer/main.ui

@@ -108,7 +108,7 @@
     </size>
    </property>
    <attribute name="toolBarArea">
-    <enum>LeftToolBarArea</enum>
+    <enum>Qt::LeftToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
@@ -136,7 +136,7 @@
   </widget>
   <widget class="QToolBar" name="tool_bar2">
    <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
+    <enum>Qt::TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>