# HG changeset patch # User koda # Date 1255786859 0 # Node ID e6cdc0251cd1afafcbab8e973a563f7737652659 # Parent 0b075d38fee572aae8694769dfb251ed3efda337 remove the svg dependency diff -r 0b075d38fee5 -r e6cdc0251cd1 QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Sat Oct 17 13:34:40 2009 +0000 +++ b/QTfrontend/CMakeLists.txt Sat Oct 17 13:40:59 2009 +0000 @@ -4,7 +4,7 @@ set(QT_USE_QTCORE TRUE) set(QT_USE_QTGUI TRUE) set(QT_USE_QTNETWORK TRUE) -set(QT_USE_QTSVG TRUE) +set(QT_USE_QTSVG FALSE) set(QT_USE_QTXML FALSE) set(QT_USE_QTOPENGL FALSE) set(QT_USE_QTMAIN TRUE) diff -r 0b075d38fee5 -r e6cdc0251cd1 QTfrontend/about.cpp --- a/QTfrontend/about.cpp Sat Oct 17 13:34:40 2009 +0000 +++ b/QTfrontend/about.cpp Sat Oct 17 13:40:59 2009 +0000 @@ -17,7 +17,6 @@ */ #include -#include #include #include #include "about.h" @@ -27,9 +26,17 @@ QWidget(parent) { QGridLayout *mainLayout = new QGridLayout(this); - QSvgWidget *hedgehog = new QSvgWidget(":/res/Hedgehog.svg", this); - hedgehog->setFixedSize(300, 329); - mainLayout->addWidget(hedgehog, 0, 0, 2, 1); + QLabel *imageLabel = new QLabel; + QImage image(":/res/Hedgehog.png"); + + imageLabel->setPixmap(QPixmap::fromImage(image)); + imageLabel->setScaledContents(true); + + imageLabel->setMinimumWidth(2.8); + imageLabel->setMaximumWidth(280); + imageLabel->setMinimumHeight(30); + imageLabel->setMaximumHeight(300); + mainLayout->addWidget(imageLabel, 0, 0, 2, 1); QLabel *lbl1 = new QLabel(this); diff -r 0b075d38fee5 -r e6cdc0251cd1 QTfrontend/hedgewars.qrc --- a/QTfrontend/hedgewars.qrc Sat Oct 17 13:34:40 2009 +0000 +++ b/QTfrontend/hedgewars.qrc Sat Oct 17 13:40:59 2009 +0000 @@ -17,7 +17,7 @@ res/botlevels/net4.png res/botlevels/net5.png res/bonus.png - res/Hedgehog.svg + res/Hedgehog.png res/net.png res/About.png res/SimpleGame.png diff -r 0b075d38fee5 -r e6cdc0251cd1 hedgewars/SDLh.pas --- a/hedgewars/SDLh.pas Sat Oct 17 13:34:40 2009 +0000 +++ b/hedgewars/SDLh.pas Sat Oct 17 13:40:59 2009 +0000 @@ -41,7 +41,6 @@ {$linkframework SDL_image} {$linkframework SDL_ttf} {$linkframework SDL_mixer} - {$linklib openalbridge} {$linklib SDLmain} {$linklib gcc} {$ENDIF} diff -r 0b075d38fee5 -r e6cdc0251cd1 project_files/hedgewars.pro --- a/project_files/hedgewars.pro Sat Oct 17 13:34:40 2009 +0000 +++ b/project_files/hedgewars.pro Sat Oct 17 13:40:59 2009 +0000 @@ -8,7 +8,7 @@ RC_FILE = ../QTfrontend/res/hedgewars.rc } -QT += network svg xml +QT += network HEADERS += ../QTfrontend/*.h SOURCES += ../QTfrontend/*.cpp