Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build on Qt6 #116

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix build on Qt6 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f5e706
src: Use core5compat if building on Qt 6
oniongarlic Apr 28, 2023
c57dc67
tests: Use core5compat if building on Qt 6
oniongarlic Apr 28, 2023
b13cbca
tests: Use fromSecsSinceEpoch instead of fromTime_t that has been dep…
oniongarlic Apr 28, 2023
aab157c
examples: Use core5compat if building on Qt 6
oniongarlic Apr 28, 2023
76fed16
examples: setMargin() is deprected in Qt 5 and removed in Qt 6, just …
oniongarlic Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions examples/bot/bot.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CONFIG += console
CONFIG -= app_bundle
QT = core network

greaterThan(QT_MAJOR_VERSION,5): QT += core5compat

# Input
HEADERS += ircbot.h
SOURCES += ircbot.cpp main.cpp
Expand Down
1 change: 0 additions & 1 deletion examples/client/ircclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ void IrcClient::createLayout()
QWidget* container = new QWidget(this);
QVBoxLayout* layout = new QVBoxLayout(container);
layout->setSpacing(0);
layout->setMargin(0);
layout->addWidget(splitter);
layout->addWidget(lineEdit);

Expand Down
3 changes: 3 additions & 0 deletions src/module_build.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ isEmpty(IRC_MODULE):error(IRC_MODULE must be set)
TEMPLATE = lib
TARGET = $$qtLibraryTarget($$IRC_MODULE)
QT = core network

greaterThan(QT_MAJOR_VERSION,5): QT += core5compat

!verbose:CONFIG += silent
contains(QT_CONFIG, debug_and_release) {
win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/ircconnection/tst_ircconnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@ void tst_IrcConnection::testMessageComposer()
QCOMPARE(filter.values.value("account").toString(), QString("qtaccountant"));
QEXPECT_FAIL("", "RPL_WHOISHOST :is connecting from *@88.95.51.136 88.95.51.136", Continue);
QCOMPARE(filter.values.value("address").toString(), QString("88.95.51.136"));
QCOMPARE(filter.values.value("since").toDateTime(), QDateTime::fromTime_t(1440706032));
QCOMPARE(filter.values.value("since").toDateTime(), QDateTime::fromSecsSinceEpoch(1440706032));
QCOMPARE(filter.values.value("idle").toInt(), 15);
QCOMPARE(filter.values.value("secure").toBool(), true);
QCOMPARE(filter.values.value("channels").toStringList(), QStringList() << "+#jpnurmi");
Expand Down
2 changes: 2 additions & 0 deletions tests/tests.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ CONFIG(debug, debug|release) {
MOC_DIR = release
}

greaterThan(QT_MAJOR_VERSION,5): QT += core5compat

IRC_BUILDDIR = $$OUT_PWD/../../..

IRC_MODULES = IrcCore IrcModel IrcUtil
Expand Down