Commit 8a4909a2 authored by ludi's avatar ludi

linking

parent 7cf51565
WEBKITPATH = /usr/local
LIBS += -L$$WEBKITPATH/lib -lQt5WebKit -lQt5WebKitWidgets -Wl,-rpath,$$WEBKITPATH/lib
INCLUDEPATH += $$WEBKITPATH/include $$WEBKITPATH/include/QtWebKit $$WEBKITPATH/include/QtWebKitWidgets
#LIBS += -L$$WEBKITPATH/lib -lQt5WebKit -lQt5WebKitWidgets -Wl,-rpath,$$WEBKITPATH/lib
#INCLUDEPATH += $$WEBKITPATH/include $$WEBKITPATH/include/QtWebKit $$WEBKITPATH/include/QtWebKitWidgets
QT += core printsupport
QT += core printsupport webkitwidgets
CONFIG += c++11
......
......@@ -4,13 +4,13 @@
#
#-------------------------------------------------
WEBKITPATH = /usr/local
LIBS += -L$$WEBKITPATH/lib -lQt5WebKit -lQt5WebKitWidgets -Wl,-rpath,$$WEBKITPATH/lib
INCLUDEPATH += $$WEBKITPATH/include $$WEBKITPATH/include/QtWebKit $$WEBKITPATH/include/QtWebKitWidgets
#WEBKITPATH = /usr/local
#LIBS += -L$$WEBKITPATH/lib -lQt5WebKit -lQt5WebKitWidgets -Wl,-rpath,$$WEBKITPATH/lib
#INCLUDEPATH += $$WEBKITPATH/include $$WEBKITPATH/include/QtWebKit $$WEBKITPATH/include/QtWebKitWidgets
QT += core gui printsupport
#QT += webkitwidgets
QT += webkitwidgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
......
/****************************************************************************
** Meta object code from reading C++ file 'mainwindow.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.8.1)
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
......@@ -12,14 +12,14 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'mainwindow.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.8.1. It"
#error "This file was generated using the moc from 5.9.5. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
//QT_WARNING_DISABLE_DEPRECATED
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_MainWindow_t {
QByteArrayData data[8];
char stringdata0[80];
......@@ -94,7 +94,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
const QMetaObject MainWindow::staticMetaObject = {
{ &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow.data,
qt_meta_data_MainWindow, qt_static_metacall, Q_NULLPTR, Q_NULLPTR}
qt_meta_data_MainWindow, qt_static_metacall, nullptr, nullptr}
};
......@@ -105,9 +105,9 @@ const QMetaObject *MainWindow::metaObject() const
void *MainWindow::qt_metacast(const char *_clname)
{
if (!_clname) return Q_NULLPTR;
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_MainWindow.stringdata0))
return static_cast<void*>(const_cast< MainWindow*>(this));
return static_cast<void*>(this);
return QMainWindow::qt_metacast(_clname);
}
......
/********************************************************************************
** Form generated from reading UI file 'mainwindow.ui'
**
** Created by: Qt User Interface Compiler version 5.8.1
** Created by: Qt User Interface Compiler version 5.9.5
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment