matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use modeltest only for debug and if Qt >= 5.7

Browse Source 
The modeltest code is not compatible with Qt 5.6 LTS
This commit is contained in:
Srivats P 2018-04-02 20:39:44 +05:30
parent db231054da
commit 227b8bdae4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/ostinato.pro
View File

@ -115,7 +115,8 @@ QMAKE_DISTCLEAN += object_script.*
include(../install.pri) include(../install.pri)
include(../version.pri) include(../version.pri)
# TODO(LOW): Test only
INCLUDEPATH += "../extra/modeltest" INCLUDEPATH += "../extra/modeltest"
greaterThan(QT_MINOR_VERSION, 6) {
CONFIG(debug, debug|release): LIBS += -L"../extra/modeltest/$(OBJECTS_DIR)/" -lmodeltest CONFIG(debug, debug|release): LIBS += -L"../extra/modeltest/$(OBJECTS_DIR)/" -lmodeltest
CONFIG(debug, debug|release): QT += testlib CONFIG(debug, debug|release): QT += testlib
}

2
client/portgrouplist.cpp
View File

@ -30,7 +30,7 @@ PortGroupList::PortGroupList()
mDeviceGroupModel(this), mDeviceGroupModel(this),
mDeviceModel(this) mDeviceModel(this)
{ {
#ifdef QT_NO_DEBUG #if defined(QT_NO_DEBUG) || QT_VERSION < 0x050700
streamModelTester_ = NULL; streamModelTester_ = NULL;
portModelTester_ = NULL; portModelTester_ = NULL;
portStatsModelTester_ = NULL; portStatsModelTester_ = NULL;

2
client/streamconfigdialog.cpp
View File

@ -175,7 +175,7 @@ StreamConfigDialog::StreamConfigDialog(
LoadCurrentStream(); LoadCurrentStream();
mpPacketModel = new PacketModel(this); mpPacketModel = new PacketModel(this);
tvPacketTree->setModel(mpPacketModel); tvPacketTree->setModel(mpPacketModel);
#ifdef QT_NO_DEBUG #if defined(QT_NO_DEBUG) || QT_VERSION < 0x050700
mpPacketModelTester = NULL; mpPacketModelTester = NULL;
#else #else
mpPacketModelTester = new ModelTest(mpPacketModel); mpPacketModelTester = new ModelTest(mpPacketModel);