diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ksirk VERSION ${KDE_APPLICATIONS_VERSION}) -set (QT_MIN_VERSION "5.7.0") +set (QT_MIN_VERSION "5.8.0") set (KF5_MIN_VERSION "5.30.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) diff --git a/ksirk/GameLogic/gameautomaton.cpp b/ksirk/GameLogic/gameautomaton.cpp --- a/ksirk/GameLogic/gameautomaton.cpp +++ b/ksirk/GameLogic/gameautomaton.cpp @@ -2198,6 +2198,7 @@ case DecrNbArmies: stream >> countryName >> nbArmies; m_game->theWorld()->countryNamed(countryName)->decrNbArmies(nbArmies); + Q_FALLTHROUGH(); case StartLocalCurrentAI: m_game->startLocalCurrentAI(); break; diff --git a/ksirk/GameLogic/goal.h b/ksirk/GameLogic/goal.h --- a/ksirk/GameLogic/goal.h +++ b/ksirk/GameLogic/goal.h @@ -68,7 +68,7 @@ /** Default destructor */ ~Goal(); - + //@{ /** Accessors for the goal type */ inline GoalType type() const {return m_type;} diff --git a/ksirk/krightdialog.cpp b/ksirk/krightdialog.cpp --- a/ksirk/krightdialog.cpp +++ b/ksirk/krightdialog.cpp @@ -443,31 +443,31 @@ QHBoxLayout * deAtt = new QHBoxLayout(); QHBoxLayout * deDef = new QHBoxLayout(); - if(A1!=0 || A1!=-1) + if(A1!=0 && A1!=-1) { QLabel * de1 = new QLabel(); de1->setPixmap(game->getDice(KGameWindow::Red,A1)); rightContents.insert(0,de1);deAtt->addWidget(de1); } - if(A2!=0 || A2!=-1) + if(A2!=0 && A2!=-1) { QLabel * de2= new QLabel(); de2->setPixmap(game->getDice(KGameWindow::Red,A2)); rightContents.insert(0,de2);deAtt->addWidget(de2); } - if(A3!=0 || A3!=-1) + if(A3!=0 && A3!=-1) { QLabel * de3= new QLabel(); de3->setPixmap(game->getDice(KGameWindow::Red,A3)); rightContents.insert(0,de3);deAtt->addWidget(de3); } - if(D1!=0 || D1!=-1) + if(D1!=0 && D1!=-1) { QLabel * de4= new QLabel(); de4->setPixmap(game->getDice(KGameWindow::Blue,D1)); rightContents.insert(0,de4);deDef->addWidget(de4); } - if(D2!=0 || D2!=-1) + if(D2!=0 && D2!=-1) { QLabel * de5= new QLabel(); de5->setPixmap(game->getDice(KGameWindow::Blue,D2)); diff --git a/ksirkskineditor/onu.cpp b/ksirkskineditor/onu.cpp --- a/ksirkskineditor/onu.cpp +++ b/ksirkskineditor/onu.cpp @@ -778,7 +778,7 @@ void ONU::setFont(const QFont& font) { if (m_font.family == font.family() - && m_font.size == font.pointSize() + && (int)m_font.size == font.pointSize() && m_font.weight == (QFont::Weight)font.weight() && m_font.italic == font.italic()) return;