Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

[Qt5] Fixed building with Qt5.

Browse Source
This commit is contained in:
nowrep 2013-02-18 13:37:12 +01:00
parent 5b0f37abd5
commit 4f53179752
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/plugins/qtwebkit/qtwebkitplugin.cpp
View File

@ -56,4 +56,8 @@ QObject* QtWebKitPlugin::createExtension(Extension ext) const
Q_EXPORT_PLUGIN2(qtwebkitplugins, QtWebKitPlugin)
#endif
#if (QT_VERSION < 0x050000)
Q_IMPORT_PLUGIN(qtwebkitplugins)
#else
Q_IMPORT_PLUGIN(QtWebKitPlugin)
#endif

25
src/main/main.cpp
View File

@ -113,6 +113,7 @@ void qupzilla_signal_handler(int s)
}
#endif
#if (QT_VERSION < 0x050000)
void msgHandler(QtMsgType type, const char* msg)
{
// Skip this debug message as it may occur in a large amount over time
@ -135,12 +136,36 @@ void msgHandler(QtMsgType type, const char* msg)
break;
}
}
#else
void msgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
QByteArray localMsg = msg.toLocal8Bit();
switch (type) {
case QtDebugMsg:
case QtWarningMsg:
case QtCriticalMsg:
fprintf(stderr, "%s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
break;
case QtFatalMsg:
fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
abort();
default:
break;
}
}
#endif
int main(int argc, char* argv[])
{
QT_REQUIRE_VERSION(argc, argv, "4.7.0");
#if (QT_VERSION < 0x050000)
qInstallMsgHandler(&msgHandler);
#else
qInstallMessageHandler(&msgHandler);
#endif
#if defined(QZ_WS_X11) && QT_VERSION < 0x050000
QApplication::setGraphicsSystem("raster"); // Better overall performance on X11