diff options
Diffstat (limited to 'dev-qt/assistant/files')
-rw-r--r-- | dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch | 12 | ||||
-rw-r--r-- | dev-qt/assistant/files/disable-webkit.patch | 26 |
2 files changed, 0 insertions, 38 deletions
diff --git a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch deleted file mode 100644 index 1cf70275f634..000000000000 --- a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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); - } - diff --git a/dev-qt/assistant/files/disable-webkit.patch b/dev-qt/assistant/files/disable-webkit.patch deleted file mode 100644 index 61bca05148e5..000000000000 --- a/dev-qt/assistant/files/disable-webkit.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 \
\ No newline at end of file |