Группа :: Обучение
Пакет: pictomir
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: alt-qt5.patch
Скачать
Скачать
--- a/src/3rd-party/cookiejar/cookieexceptionsmodel.cpp23 +0300
+++ b/src/3rd-party/cookiejar/cookieexceptionsmodel.cpp
@@ -217,6 +217,7 @@ void CookieExceptionsModel::addHost(QStr
add.removeOne(otherRule);
remove1.removeOne(otherRule);
remove2.removeOne(otherRule);
- reset();
+ beginResetModel();
+ endResetModel();
}
--- a/src/3rd-party/cookiejar/cookiemodel.cpp
+++ b/src/3rd-party/cookiejar/cookiemodel.cpp
@@ -195,5 +195,6 @@ void CookieModel::cookiesChanged()
{
if (m_cookieJar)
m_cookies = m_cookieJar->cookies();
- reset();
+ beginResetModel();
+ endResetModel();
}
--- a/src/3rd-party/cookiejar/searchbutton.cpp
+++ b/src/3rd-party/cookiejar/searchbutton.cpp
@@ -23,6 +23,7 @@
#include <qevent.h>
#include <qlineedit.h>
#include <qpainter.h>
+#include <QPainterPath>
SearchButton::SearchButton(QWidget *parent)
: QAbstractButton(parent)
--- a/src/3rd-party/cookiejar/networkcookiejar/networkcookiejar.pri
+++ b/src/3rd-party/cookiejar/networkcookiejar/networkcookiejar.pri
@@ -1,5 +1,5 @@
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
-HEADERS += trie_p.h networkcookiejar.h twoleveldomains_p.h networkcookiejar_p.h
-SOURCES += networkcookiejar.cpp
+HEADERS += 3rd-party/cookiejar/networkcookiejar/trie_p.h 3rd-party/cookiejar/networkcookiejar/networkcookiejar.h 3rd-party/cookiejar/networkcookiejar/twoleveldomains_p.h 3rd-party/cookiejar/networkcookiejar/networkcookiejar_p.h
+SOURCES += 3rd-party/cookiejar/networkcookiejar/networkcookiejar.cpp
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,7 +1,7 @@
# -------------------------------------------------
# Project created by QtCreator 2009-07-06T15:36:24
# -------------------------------------------------
-QT += svg xml network script webkit
+QT += svg xml network script webkit webkitwidgets
win32-g++:QMAKE_CXXFLAGS += -Werror
#unix:QMAKE_CXXFLAGS += -Werror -Woverloaded-virtual -Wundef -Wall
#macx:QMAKE_CXXFLAGS -= -Werror -std=c++0x
--- a/src/runtime/krt.cpp
+++ b/src/runtime/krt.cpp
@@ -151,7 +151,7 @@ QMetaMethod KRT_private::findMethod(cons
QRegExp rxName("(.+)\\(.*");
Q_ASSERT(rxName.isValid());
for (int i=0; i<metaObject()->methodCount(); i++) {
- s = QString::fromAscii(metaObject()->method(i).signature());
+ s = QString::fromAscii(metaObject()->method(i).methodSignature());
int brPos = s.indexOf("(");
if (brPos==-1)
n = s;
--- a/src/webkit/w_mainwindow.cpp
+++ b/src/webkit/w_mainwindow.cpp
@@ -132,8 +132,8 @@ void MainWindow::restoreSettings()
move(r.topLeft());
QString startUrl;
- for (int i=1; i<qApp->argc(); i++) {
- const QString arg = qApp->arguments()[i];
+ for (int i=1; i<QCoreApplication::arguments().count(); i++) {
+ const QString arg = QCoreApplication::arguments()[i];
if (!arg.startsWith("-")) {
startUrl = arg;
}