[gentoo-commits] gentoo-x86 commit in dev-qt/qthelp/files: disable-webkit.patch qthelp-4.7-fix-compat.patch qthelp-4.8.2+gcc-4.7.patch

[Ben de Groot (yngwin)]

yngwin      13/03/02 15:30:20

  Added:                disable-webkit.patch qthelp-4.7-fix-compat.patch
                        qthelp-4.8.2+gcc-4.7.patch
  Log:
  Move to new dev-qt category
  
  (Portage version: 2.2.0_alpha164/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x2B2474AD43CE296E!)

Revision  Changes    Path
1.1                  dev-qt/qthelp/files/disable-webkit.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/disable-webkit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/disable-webkit.patch?rev=1.1&content-type=text/plain

Index: disable-webkit.patch
===================================================================
Index: qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
===================================================================
--- qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro
+++ qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro
@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa
 TEMPLATE = app
 LANGUAGE = C++
 TARGET = assistant
-contains(QT_CONFIG, webkit):QT += webkit
 CONFIG += qt \
     warn_on \
     help
@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \
     openpageswidget.cpp \
     openpagesmanager.cpp \
     openpagesswitcher.cpp
-contains(QT_CONFIG, webkit) {
-    SOURCES += helpviewer_qwv.cpp
-} else {
-    SOURCES += helpviewer_qtb.cpp
-}
+
+SOURCES += helpviewer_qtb.cpp
 
 FORMS += bookmarkdialog.ui \
     bookmarkmanagerwidget.ui \


1.1                  dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch?rev=1.1&content-type=text/plain

Index: qthelp-4.7-fix-compat.patch
===================================================================
--- tools/assistant/compat/compat.pro	2010-10-08 16:54:09.804000000 +0300
+++ tools/assistant/compat/compat.pro	2010-10-08 16:54:37.884000000 +0300
@@ -14,6 +14,8 @@
 
 PROJECTNAME = Assistant
 
+DESTDIR = ../../../bin
+
 FORMS += helpdialog.ui \
         mainwindow.ui \
         tabbedbrowser.ui \
@@ -59,6 +61,9 @@
     TARGET = Assistant_adp
 }
 
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS += target
+
 TRANSLATIONS = translations/assistant_adp_de.ts \
     translations/assistant_adp_ja.ts \
     translations/assistant_adp_pl.ts \
--- tools/assistant/assistant.pro	2010-09-10 12:04:47.000000000 +0300
+++ tools/assistant/assistant.pro	2010-06-02 05:03:09.000000000 +0300
@@ -3,4 +3,6 @@
 
 SUBDIRS += lib/fulltextsearch \
            lib \
-           tools
+           tools \
+           compat \
+           compat/lib \
\ No newline at end of file
--- /dev/null
+++ tools/assistant/compat/lib/QtAssistant/qassistantclient_global.h
@@ -0,0 +1 @@
+#include "../qassistantclient_global.h"
--- /dev/null	2010-09-28 21:07:22.854999850 +0300
+++ tools/assistant/compat/assistant.pro	2010-06-02 05:03:09.000000000 +0300
@@ -0,0 +1,84 @@
+include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
+
+TEMPLATE = app
+LANGUAGE = C++
+TARGET = assistant_adp
+
+CONFIG += qt warn_on
+
+unix:contains(QT_CONFIG, dbus):QT += dbus
+
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+QT += xml network
+
+PROJECTNAME = Assistant
+DESTDIR = ../../../bin
+
+FORMS += helpdialog.ui \
+        mainwindow.ui \
+        tabbedbrowser.ui \
+        topicchooser.ui
+
+SOURCES += main.cpp \
+        helpwindow.cpp \
+        topicchooser.cpp \
+        docuparser.cpp \
+        index.cpp \
+        profile.cpp \
+        config.cpp \
+        helpdialog.cpp \
+        mainwindow.cpp \
+        tabbedbrowser.cpp \
+        fontsettingsdialog.cpp
+
+HEADERS += helpwindow.h \
+        topicchooser.h \
+        docuparser.h \
+        index.h \
+        profile.h \
+        helpdialog.h \
+        mainwindow.h \
+        tabbedbrowser.h \
+        config.h \
+        fontsettingsdialog.h
+
+RESOURCES += assistant.qrc
+
+contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
+DEFINES += QT_KEYWORDS
+#DEFINES +=  QT_PALMTOPCENTER_DOCS
+
+win32 {
+    !wince*:LIBS += -lshell32
+    RC_FILE = assistant.rc
+}
+
+mac {
+    ICON = assistant.icns
+    TARGET = Assistant_adp
+    QMAKE_INFO_PLIST = Info_mac.plist
+}
+
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS += target
+
+TRANSLATIONS = assistant_de.ts
+
+unix:!contains(QT_CONFIG, zlib):LIBS += -lz
+
+contains(CONFIG, static): {
+    win32 {
+        exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) {
+            QTPLUGIN += qjpeg
+            DEFINES += USE_STATIC_JPEG_PLUGIN            
+        }
+    } else {
+        exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.a) {
+            QTPLUGIN += qjpeg
+            DEFINES += USE_STATIC_JPEG_PLUGIN            
+        }        
+    }
+}



1.1                  dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch?rev=1.1&content-type=text/plain

Index: qthelp-4.8.2+gcc-4.7.patch
===================================================================
--- tools/assistant/tools/assistant/mainwindow.cpp	2012-06-27 03:02:37.539564947 +0200
+++ tools/assistant/tools/assistant/mainwindow.cpp	2012-06-27 03:03:18.843561620 +0200
@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
     if (helpEngine.usesAppFont())
         font = helpEngine.appFont();
 
-    const QWidgetList &widgets = qApp->allWidgets();
-    foreach (QWidget* widget, widgets)
+    foreach (QWidget* widget, QApplication::allWidgets())
         widget->setFont(font);
 }