Merge pull request #126 from ctrlaltca/cmake_qt5

Qt5 support
2026-07-05 13:03:55 -07:00 · 2014-07-10 13:13:51 -04:00 · 2014-07-10 13:13:51 -04:00 · f83d58309b
commit f83d58309b
parent 86fa8f304d ea8c55b2c9
44 changed files with 703 additions and 159 deletions
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@ -90,7 +90,7 @@ SET(cockatrice_SOURCES
    src/qt-json/json.cpp
    src/soundengine.cpp
    src/pending_command.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp
+    ${VERSION_STRING_CPP}
 )

 if (UNIX AND NOT APPLE)
@ -125,41 +125,119 @@ if(APPLE)
    set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 ENDIF(APPLE)

-if (NOT QT_QTMULTIMEDIA_FOUND)
-    SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-    FIND_PACKAGE(QtMobility REQUIRED)
-endif (NOT QT_QTMULTIMEDIA_FOUND)
+set(COCKATRICE_LIBS)

-SET(QT_USE_QTNETWORK TRUE)
-SET(QT_USE_QTMULTIMEDIA TRUE)
-SET(QT_USE_QTXML TRUE)
-SET(QT_USE_QTSVG TRUE)
+# Qt4 stuff
+if(Qt4_FOUND)
+    if (NOT QT_QTMULTIMEDIA_FOUND)
+        FIND_PACKAGE(QtMobility REQUIRED)
+    endif()
+
+    SET(QT_USE_QTNETWORK TRUE)
+    SET(QT_USE_QTMULTIMEDIA TRUE)
+    SET(QT_USE_QTXML TRUE)
+    SET(QT_USE_QTSVG TRUE)
+
+    # Include directories
+    INCLUDE(${QT_USE_FILE})
+    INCLUDE_DIRECTORIES(${QT_INCLUDES})
+    INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
+    INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR})
+    LIST(APPEND COCKATRICE_LIBS ${QT_LIBRARIES})
+    LIST(APPEND COCKATRICE_LIBS ${QT_QTMAIN_LIBRARY})
+    LIST(APPEND COCKATRICE_LIBS ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY})
+
+    # Let cmake chew Qt4's translations and resource files
+    # Note: header files are MOC-ed automatically by cmake
+    QT4_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS})
+    QT4_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+endif()
+
+# qt5 stuff
+if(Qt5Widgets_FOUND)
+    include_directories(${Qt5Widgets_INCLUDE_DIRS})
+    list(APPEND COCKATRICE_LIBS Widgets)
+
+    # QtNetwork
+    find_package(Qt5Network)
+    if(Qt5Network_FOUND)
+        include_directories(${Qt5Network_INCLUDE_DIRS})
+        list(APPEND COCKATRICE_LIBS Network)
+    endif()
+
+    # QtMultimedia
+    find_package(Qt5Multimedia)
+    if(Qt5Multimedia_FOUND)
+        include_directories(${Qt5Multimedia_INCLUDE_DIRS})
+        list(APPEND COCKATRICE_LIBS Multimedia)
+    endif()
+
+    # QtPrinter
+    find_package(Qt5PrintSupport)
+    if(Qt5PrintSupport_FOUND)
+        include_directories(${Qt5PrintSupport_INCLUDE_DIRS})
+        list(APPEND COCKATRICE_LIBS PrintSupport)
+    endif()
+
+    # QtXml
+    find_package(Qt5Xml)
+    if(Qt5Xml_FOUND)
+        include_directories(${Qt5Xml_INCLUDE_DIRS})
+        list(APPEND COCKATRICE_LIBS Xml)
+    endif()
+
+    # QtSvg
+    find_package(Qt5Svg)
+    if(Qt5Svg_FOUND)
+        include_directories(${Qt5Svg_INCLUDE_DIRS})
+        list(APPEND COCKATRICE_LIBS Svg)
+    endif()
+
+    # Qt5LinguistTools
+    find_package(Qt5LinguistTools)
+    if(Qt5LinguistTools_FOUND)
+        include_directories(${Qt5LinguistTools_INCLUDE_DIRS})
+        list(APPEND COCKATRICE_LIBS LinguistTools)
+    endif()
+
+    # Let cmake chew Qt5's translations and resource files
+    # Note: header files are MOC-ed automatically by cmake
+    QT5_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS})
+    QT5_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+
+    # guess plugins and libraries directory
+    set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins")
+    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
+    get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
+endif()

 # Declare path variables
 set(ICONDIR share/icons CACHE STRING "icon dir")
 set(DESKTOPDIR share/applications CACHE STRING "desktop file destination")

-# Let cmake chew Qt4's translations and resource files
-# Note: header files are MOC-ed automatically by cmake
-QT4_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS})
-QT4_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
-
 # Include directories
-INCLUDE(${QT_USE_FILE})
 INCLUDE_DIRECTORIES(../common)
 INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/common)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR})

 # Build cockatrice binary and link it
 ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_MOC_SRCS})
-TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY})

-if(MSVC)
-	set_target_properties(cockatrice PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-endif(MSVC)
+if(Qt4_FOUND)
+    if(MSVC) 
+        set(QT_USE_QTMAIN true) 
+    endif() 
+    TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${COCKATRICE_LIBS})
+endif()
+if(Qt5Widgets_FOUND)
+    if(MSVC)
+        TARGET_LINK_LIBRARIES(cockatrice cockatrice_common Qt5::WinMain)
+    else()
+        TARGET_LINK_LIBRARIES(cockatrice cockatrice_common)
+    endif()
+    qt5_use_modules(cockatrice ${COCKATRICE_LIBS})
+endif()

 if(UNIX)
    if(APPLE)
@ -178,11 +256,6 @@ elseif(WIN32)
        INSTALL(FILES ${cockatrice_QM} DESTINATION ./translations)
 endif()

-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp ${CMAKE_CURRENT_BINARY_DIR}/version_string.h
-    COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/../common/getversion.cmake
-)
-
 if(APPLE)
    # these needs to be relative to CMAKE_INSTALL_PREFIX
    set(plugin_dest_dir cockatrice.app/Contents/Plugins)
@ -215,3 +288,36 @@ Data = Resources\")
        fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/cockatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
        " COMPONENT Runtime)
 endif()
+
+if(WIN32)
+    # these needs to be relative to CMAKE_INSTALL_PREFIX
+    set(plugin_dest_dir Plugins)
+    set(qtconf_dest_dir .)
+
+    # note: no codecs in qt5
+    # note: phonon_backend => mediaservice
+    # note: needs platform on osx
+
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*d\\.dll")
+    else()
+        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*[^d]\\.dll")
+    endif()
+
+    install(CODE "
+        file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
+Plugins = Plugins
+Translations = Resources/translations
+Data = Resources\")
+    " COMPONENT Runtime)
+
+    install(CODE "
+        file(GLOB_RECURSE QTPLUGINS
+            \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\")
+        set(BU_CHMOD_BUNDLE_ITEMS ON)
+        include(BundleUtilities)
+        fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/cockatrice.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
+        " COMPONENT Runtime)
+endif()
--- a/cockatrice/FindQtMobility.cmake
+++ b/cockatrice/FindQtMobility.cmake
@ -1,158 +0,0 @@
-INCLUDE(FindQt4)
-
-set(MOBILITY_CONFIG_MKSPECS_FILE "")
-IF(EXISTS "${QT_MKSPECS_DIR}/features/mobilityconfig.prf")
-    set(MOBILITY_CONFIG_MKSPECS_FILE "${QT_MKSPECS_DIR}/features/mobilityconfig.prf")
-ELSEIF(EXISTS "${QT_MKSPECS_DIR}/features/mobility.prf")
-    set(MOBILITY_CONFIG_MKSPECS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/mobilityconfig.prf")
-ENDIF()
-
-macro(export_component component)
-    IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "")
-        FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_FILE_CONTENTS)
-        STRING(TOLOWER ${component} _COMPONENT)
-        IF(${MOBILITY_FILE_CONTENTS} MATCHES "MOBILITY_CONFIG=.*${_COMPONENT}.*")
-            STRING(TOUPPER ${component} _COMPONENT)
-            SET(QT_MOBILITY_${_COMPONENT}_FOUND 1)
-            SET(QT_MOBILITY_${_COMPONENT}_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/Qt${component})
-            SET(QT_MOBILITY_${_COMPONENT}_LIBRARY Qt${component})
-        ENDIF()
-    ENDIF()
-endmacro()
-
-set(VERSION_INFO "")
-set(FEATURE_FILE_PREFIX "${QT_MKSPECS_DIR}/features/mobility")
-
-if(DEFINED MOBILITY_VERSION)
-    if(MOBILITY_VERSION STREQUAL "1.1" AND EXISTS "${FEATURE_FILE_PREFIX}11.prf")
-        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}11.prf")
-        set(VERSION_INFO "1.1")
-    elseif(MOBILITY_VERSION STREQUAL "1.2" AND EXISTS "${FEATURE_FILE_PREFIX}12.prf")
-        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}12.prf")
-        set(VERSION_INFO "1.2")
-    elseif(MOBILITY_VERSION STREQUAL "default" AND EXISTS "${FEATURE_FILE_PREFIX}.prf")
-        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}.prf")
-        set(VERSION_INFO "system's default")
-    else()
-        message(STATUS "Couldn't find QtMobility version: ${MOBILITY_VERSION}")
-    endif()
-endif()
-
-if(NOT DEFINED MOBILITY_PRF_FILE)
-    if(EXISTS "${FEATURE_FILE_PREFIX}.prf")
-        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}.prf")
-        set(VERSION_INFO "system's default")
-    elseif(EXISTS "${FEATURE_FILE_PREFIX}12.prf")
-        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}12.prf")
-        set(VERSION_INFO "1.2")
-    elseif(EXISTS "${FEATURE_FILE_PREFIX}11.prf")
-        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}11.prf")
-        set(VERSION_INFO "1.1")
-    else()
-        message(FATAL_ERROR "Couldn't find any version of QtMobility.")
-    endif()
-endif()
-
-message(STATUS "Using QtMobility version: ${VERSION_INFO}")
-
-IF(DEFINED MOBILITY_PRF_FILE)
-    FILE(READ ${MOBILITY_PRF_FILE} MOBILITY_FILE_CONTENTS)
-
-    STRING(REGEX MATCH "MOBILITY_PREFIX=([^\n]+)" QT_MOBILITY_PREFIX "${MOBILITY_FILE_CONTENTS}")
-    SET(QT_MOBILITY_PREFIX ${CMAKE_MATCH_1})
-
-    STRING(REGEX MATCH "MOBILITY_INCLUDE=([^\n]+)" QT_MOBILITY_INCLUDE_DIR "${MOBILITY_FILE_CONTENTS}")
-    SET(QT_MOBILITY_INCLUDE_DIR ${CMAKE_MATCH_1})
-
-    STRING(REGEX MATCH "MOBILITY_LIB=([^\n]+)" "\\1" QT_MOBILITY_LIBRARY "${MOBILITY_FILE_CONTENTS}")
-    SET(QT_MOBILITY_LIBRARY_DIR ${CMAKE_MATCH_1})
-
-    #VERSION
-    IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "")
-        FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_CONFIG_FILE_CONTENTS)
-        STRING(REGEX MATCH "MOBILITY_VERSION = ([^\n]+)" QT_MOBILITY_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}")
-        SET(QT_MOBILITY_VERSION ${CMAKE_MATCH_1})
-
-        STRING(REGEX MATCH "MOBILITY_MAJOR_VERSION = ([^\n]+)" QT_MOBILITY_MAJOR_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}")
-        SET(QT_MOBILITY_MAJOR_VERSION ${CMAKE_MATCH_1})
-
-        STRING(REGEX MATCH "MOBILITY_MINOR_VERSION = ([^\n]+)" QT_MOBILITY_MINOR_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}")
-        SET(QT_MOBILITY_MINOR_VERSION ${CMAKE_MATCH_1})
-
-        STRING(REGEX MATCH "MOBILITY_PATCH_VERSION = ([^\n]+)" QT_MOBILITY_PATCH_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}")
-        SET(QT_MOBILITY_PATCH_VERSION ${CMAKE_MATCH_1})
-    ELSE()
-        SET(QT_MOBILITY_VERSION 1.0.0)
-        SET(QT_MOBILITY_MAJOR_VERSION 1)
-        SET(QT_MOBILITY_MINOR_VERSION 0)
-        SET(QT_MOBILITY_PATCH_VERSION 0)
-    ENDIF()
-
-    SET(QT_MOBILITY_PARENT_INCLUDE_DIR ${QT_MOBILITY_INCLUDE_DIR})
-    SET(QT_MOBILITY_INCLUDE_DIR ${QT_MOBILITY_INCLUDE_DIR}/QtMobility)
-
-    IF(QtMobility_FIND_VERSION_EXACT)
-        IF(QT_MOBILITY_VERSION VERSION_EQUAL QtMobility_FIND_VERSION)
-            SET(QT_MOBILITY_FOUND TRUE)
-        ELSE()
-            SET(QT_MOBILITY_FOUND FALSE)
-            IF(QT_MOBILITY_VERSION VERSION_LESS QtMobility_FIND_VERSION)
-                SET(QT_MOBILITY_TOO_OLD TRUE)
-            ELSE()
-                SET(QT_MOBILITY_TOO_NEW TRUE)
-            ENDIF()
-        ENDIF()
-    ELSE()
-        IF(QT_MOBILITY_VERSION VERSION_LESS QtMobility_FIND_VERSION)
-            SET(QT_MOBILITY_FOUND FALSE)
-            SET(QT_MOBILITY_TOO_OLD TRUE)
-        ELSE()
-            SET(QT_MOBILITY_FOUND TRUE)
-        ENDIF()
-    ENDIF()
-ELSE()
-    SET(QT_MOBILITY_FOUND NOTFOUND)
-    SET(QT_MOBILITY_PREFIX NOTFOUND)
-    SET(QT_MOBILITY_INCLUDE NOTFOUND)
-    SET(QT_MOBILITY_LIB NOTFOUND)
-ENDIF()
-
-IF(NOT QT_MOBILITY_FOUND)
-    if(QT_MOBILITY_TOO_OLD)
-        MESSAGE(FATAL_ERROR "The installed QtMobility version ${QT_MOBILITY_VERSION} it too old, version ${QtMobility_FIND_VERSION} is required.")
-    ELSEIF(QT_MOBILITY_TOO_NEW)
-        MESSAGE(FATAL_ERROR "The installed QtMobility version ${QT_MOBILITY_VERSION} it too new, version ${QtMobility_FIND_VERSION} is required.")
-    ELSE()
-        MESSAGE(FATAL_ERROR "QtMobility not found.")
-    ENDIF()
-ELSE()
-    export_component(Bearer)
-    export_component(Feedback)
-    export_component(Gallery)
-    export_component(PublishSubscribe)
-    export_component(Location)
-    export_component(Organizer)
-    export_component(ServiceFramework)
-    export_component(SystemInfo)
-    export_component(Contacts)
-    export_component(Messaging)
-    export_component(Versit)
-    export_component(Sensors)
-    # VersitOrganizer
-    if(${QT_MOBILITY_CONTACTS_FOUND} AND ${QT_MOBILITY_VERSIT_FOUND})
-        SET(QT_MOBILITY_VERSITORGANIZER_FOUND 1)
-        SET(QT_MOBILITY_VERSITORGANIZER_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/QtVersitOrganizer)
-        SET(QT_MOBILITY_VERSITORGANIZER_LIBRARY QtVersitOrganizer)
-    endif()
-
-    # MultimediaKit - it's just 'multimedia' in the .prf file.
-    IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "")
-        FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_FILE_CONTENTS)
-        IF(${MOBILITY_FILE_CONTENTS} MATCHES "MOBILITY_CONFIG=.*multimedia.*")
-            SET(QT_MOBILITY_MULTIMEDIAKIT_FOUND 1)
-            SET(QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/QtMultimediaKit)
-            SET(QT_MOBILITY_MULTIMEDIAKIT_LIBRARY QtMultimediaKit)
-        ENDIF()
-    ENDIF()
-
-ENDIF()
--- a/cockatrice/src/abstractcounter.cpp
+++ b/cockatrice/src/abstractcounter.cpp
@ -11,8 +11,12 @@
 AbstractCounter::AbstractCounter(Player *_player, int _id, const QString &_name, bool _shownInCounterArea, int _value, QGraphicsItem *parent)
    : QGraphicsItem(parent), player(_player), id(_id), name(_name), value(_value), hovered(false), aDec(0), aInc(0), dialogSemaphore(false), deleteAfterDialog(false), shownInCounterArea(_shownInCounterArea)
 {
+#if QT_VERSION < 0x050000
    setAcceptsHoverEvents(true);
-    
+#else
+    setAcceptHoverEvents(true);
+#endif
+
    if (player->getLocal()) {
        menu = new QMenu(name);
        aSet = new QAction(this);
@ -129,7 +133,13 @@ void AbstractCounter::setCounter()
 {
    bool ok;
    dialogSemaphore = true;
-    int newValue = QInputDialog::getInteger(0, tr("Set counter"), tr("New value for counter '%1':").arg(name), value, -2000000000, 2000000000, 1, &ok);
+    int newValue = 
+#if QT_VERSION < 0x050000
+    QInputDialog::getInteger(
+#else
+    QInputDialog::getInt(
+#endif
+        0, tr("Set counter"), tr("New value for counter '%1':").arg(name), value, -2000000000, 2000000000, 1, &ok);
    if (deleteAfterDialog) {
        deleteLater();
        return;
--- a/cockatrice/src/carddatabasemodel.cpp
+++ b/cockatrice/src/carddatabasemodel.cpp
@ -68,6 +68,8 @@ QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation,

 void CardDatabaseModel::updateCardList()
 {
+    beginResetModel();
+
    for (int i = 0; i < cardList.size(); ++i)
        disconnect(cardList[i], 0, this, 0);
    
@ -75,7 +77,7 @@ void CardDatabaseModel::updateCardList()
    for (int i = 0; i < cardList.size(); ++i)
        connect(cardList[i], SIGNAL(cardInfoChanged(CardInfo *)), this, SLOT(cardInfoChanged(CardInfo *)));
    
-    reset();
+    endResetModel();
 }

 void CardDatabaseModel::cardInfoChanged(CardInfo *card)
--- a/cockatrice/src/decklistmodel.cpp
+++ b/cockatrice/src/decklistmodel.cpp
@ -30,6 +30,8 @@ DeckListModel::~DeckListModel()

 void DeckListModel::rebuildTree()
 {
+    beginResetModel();
+
    root->clearTree();
    InnerDecklistNode *listRoot = deckList->getRoot();
    for (int i = 0; i < listRoot->size(); i++) {
@ -55,7 +57,7 @@ void DeckListModel::rebuildTree()
        }
    }

-    reset();
+    endResetModel();
 }

 int DeckListModel::rowCount(const QModelIndex &parent) const
--- a/cockatrice/src/deckstats_interface.cpp
+++ b/cockatrice/src/deckstats_interface.cpp
@ -7,6 +7,10 @@
 #include <QMessageBox>
 #include <QDesktopServices>

+#if QT_VERSION >= 0x050000
+#include <QUrlQuery>
+#endif
+
 DeckStatsInterface::DeckStatsInterface(QObject *parent)
    : QObject(parent)
 {
@ -39,12 +43,29 @@ void DeckStatsInterface::queryFinished(QNetworkReply *reply)
    deleteLater();
 }

-void DeckStatsInterface::analyzeDeck(DeckList *deck)
+#if QT_VERSION < 0x050000
+void DeckStatsInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
 {
    QUrl params;
    params.addQueryItem("deck", deck->writeToString_Plain());
+    data->append(params.encodedQuery());
+}
+#else
+void DeckStatsInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
+{
+    QUrl params;
+    QUrlQuery urlQuery;
+    urlQuery.addQueryItem("deck", deck->writeToString_Plain());
+    params.setQuery(urlQuery);
+    data->append(params.query(QUrl::EncodeReserved));
+}
+#endif
+
+
+void DeckStatsInterface::analyzeDeck(DeckList *deck)
+{
    QByteArray data;
-    data.append(params.encodedQuery());
+    getAnalyzeRequestData(deck, &data);
    
    QNetworkRequest request(QUrl("http://deckstats.net/index.php"));
    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
--- a/cockatrice/src/deckstats_interface.h
+++ b/cockatrice/src/deckstats_interface.h
@ -3,6 +3,7 @@

 #include <QObject>

+class QByteArray;
 class QNetworkAccessManager;
 class QNetworkReply;
 class DeckList;
@ -13,6 +14,7 @@ private:
    QNetworkAccessManager *manager;
 private slots:
    void queryFinished(QNetworkReply *reply);
+    void getAnalyzeRequestData(DeckList *deck, QByteArray *data);
 public:
    DeckStatsInterface(QObject *parent = 0);
    void analyzeDeck(DeckList *deck);
--- a/cockatrice/src/deckview.cpp
+++ b/cockatrice/src/deckview.cpp
@ -64,7 +64,11 @@ void DeckViewCardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 DeckViewCard::DeckViewCard(const QString &_name, const QString &_originZone, QGraphicsItem *parent)
    : AbstractCardItem(_name, 0, -1, parent), originZone(_originZone), dragItem(0)
 {
+#if QT_VERSION < 0x050000
    setAcceptsHoverEvents(true);
+#else
+    setAcceptHoverEvents(true);
+#endif
 }

 DeckViewCard::~DeckViewCard()
--- a/cockatrice/src/dlg_create_token.cpp
+++ b/cockatrice/src/dlg_create_token.cpp
@ -79,8 +79,13 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
    chooseTokenView->header()->setStretchLastSection(false);
    chooseTokenView->header()->hideSection(1);
    chooseTokenView->header()->hideSection(2);
+#if QT_VERSION < 0x050000
    chooseTokenView->header()->setResizeMode(3, QHeaderView::ResizeToContents);
    chooseTokenView->header()->setResizeMode(4, QHeaderView::ResizeToContents);
+#else
+    chooseTokenView->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
+    chooseTokenView->header()->setSectionResizeMode(4, QHeaderView::ResizeToContents);
+#endif
    connect(chooseTokenView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, SLOT(tokenSelectionChanged(QModelIndex, QModelIndex)));
    
    if (predefinedTokens.isEmpty())
--- a/cockatrice/src/dlg_edit_tokens.cpp
+++ b/cockatrice/src/dlg_edit_tokens.cpp
@ -73,8 +73,13 @@ DlgEditTokens::DlgEditTokens(CardDatabaseModel *_cardDatabaseModel, QWidget *par
    chooseTokenView->header()->setStretchLastSection(false);
    chooseTokenView->header()->hideSection(1);
    chooseTokenView->header()->hideSection(2);
+#if QT_VERSION < 0x050000
    chooseTokenView->header()->setResizeMode(3, QHeaderView::ResizeToContents);
    chooseTokenView->header()->setResizeMode(4, QHeaderView::ResizeToContents);
+#else
+    chooseTokenView->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
+    chooseTokenView->header()->setSectionResizeMode(4, QHeaderView::ResizeToContents);
+#endif
    connect(chooseTokenView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, SLOT(tokenSelectionChanged(QModelIndex, QModelIndex)));
    
    QAction *aAddToken = new QAction(tr("Add token"), this);
--- a/cockatrice/src/gameselector.cpp
+++ b/cockatrice/src/gameselector.cpp
@ -33,8 +33,11 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
        gameListView->header()->hideSection(1);
    else
        gameListProxyModel->setUnavailableGamesVisible(true);
+#if QT_VERSION < 0x050000
    gameListView->header()->setResizeMode(1, QHeaderView::ResizeToContents);
-
+#else
+    gameListView->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+#endif
    filterButton = new QPushButton;
    filterButton->setIcon(QIcon(":/resources/icon_search.svg"));
    connect(filterButton, SIGNAL(clicked()), this, SLOT(actSetFilter()));
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@ -55,6 +55,7 @@ QString translationPath = TRANSLATION_PATH;
 QString translationPath = QString();
 #endif

+#if QT_VERSION < 0x050000
 static void myMessageOutput(QtMsgType /*type*/, const char *msg)
 {
    QFile file("qdebug.txt");
@ -63,6 +64,16 @@ static void myMessageOutput(QtMsgType /*type*/, const char *msg)
    out << msg << endl;
    file.close();
 }
+#else
+static void myMessageOutput(QtMsgType /*type*/, const QMessageLogContext &, const QString &msg)
+{
+    QFile file("qdebug.txt");
+    file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
+    QTextStream out(&file);
+    out << msg << endl;
+    file.close();
+}
+#endif

 void installNewTranslator()
 {
@ -87,11 +98,21 @@ int main(int argc, char *argv[])
    QApplication app(argc, argv);

    if (app.arguments().contains("--debug-output"))
+    {
+#if QT_VERSION < 0x050000
        qInstallMsgHandler(myMessageOutput);
+#else
+        qInstallMessageHandler(myMessageOutput);
+#endif
+    }
 #ifdef Q_OS_WIN
    app.addLibraryPath(app.applicationDirPath() + "/plugins");
 #endif
+
+#if QT_VERSION < 0x050000
+    // gone in Qt5, all source files _MUST_ be utf8-encoded
    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+#endif

    QCoreApplication::setOrganizationName("Cockatrice");
    QCoreApplication::setOrganizationDomain("cockatrice.de");
@ -114,8 +135,13 @@ int main(int argc, char *argv[])
    installNewTranslator();

    qsrand(QDateTime::currentDateTime().toTime_t());
-
+    
+    bool startMainProgram = true;
+#if QT_VERSION < 0x050000
    const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+#else
+    const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
+#endif
    if (!db->getLoadSuccess())
        if (db->loadCardDatabase(dataDir + "/cards.xml"))
            settingsCache->setCardDatabasePath(dataDir + "/cards.xml");
--- a/cockatrice/src/pilezone.cpp
+++ b/cockatrice/src/pilezone.cpp
@ -13,7 +13,11 @@ PileZone::PileZone(Player *_p, const QString &_name, bool _isShufflable, bool _c
    : CardZone(_p, _name, false, _isShufflable, _contentsKnown, parent)
 {
    setCacheMode(DeviceCoordinateCache); // Do not move this line to the parent constructor!
+#if QT_VERSION < 0x050000
    setAcceptsHoverEvents(true);
+#else
+    setAcceptHoverEvents(true);
+#endif
    setCursor(Qt::OpenHandCursor);
    
    setTransform(QTransform().translate((float) CARD_WIDTH / 2, (float) CARD_HEIGHT / 2).rotate(90).translate((float) -CARD_WIDTH / 2, (float) -CARD_HEIGHT / 2));
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@ -774,7 +774,13 @@ void Player::actViewLibrary()
 void Player::actViewTopCards()
 {
    bool ok;
-    int number = QInputDialog::getInteger(0, tr("View top cards of library"), tr("Number of cards:"), defaultNumberTopCards, 1, 2000000000, 1, &ok);
+    int number = 
+#if QT_VERSION < 0x050000
+    QInputDialog::getInteger(
+#else
+    QInputDialog::getInt(
+#endif
+        0, tr("View top cards of library"), tr("Number of cards:"), defaultNumberTopCards, 1, 2000000000, 1, &ok);
    if (ok) {
        defaultNumberTopCards = number;
        static_cast<GameScene *>(scene())->toggleZoneView(this, "deck", number);
@ -829,7 +835,13 @@ void Player::actMulligan()

 void Player::actDrawCards()
 {
-    int number = QInputDialog::getInteger(0, tr("Draw cards"), tr("Number:"));
+    int number = 
+#if QT_VERSION < 0x050000
+    QInputDialog::getInteger(
+#else
+    QInputDialog::getInt(
+#endif
+    0, tr("Draw cards"), tr("Number:"));
        if (number) {
        Command_DrawCards cmd;
        cmd.set_number(number);
@ -844,8 +856,14 @@ void Player::actUndoDraw()

 void Player::actMoveTopCardsToGrave()
 {
-    int number = QInputDialog::getInteger(0, tr("Move top cards to grave"), tr("Number:"));
-        if (!number)
+    int number = 
+#if QT_VERSION < 0x050000
+    QInputDialog::getInteger(
+#else
+    QInputDialog::getInt(
+#endif
+    0, tr("Move top cards to grave"), tr("Number:"));
+    if (!number)
        return;

    const int maxCards = zones.value("deck")->getCards().size();
@ -867,8 +885,14 @@ void Player::actMoveTopCardsToGrave()

 void Player::actMoveTopCardsToExile()
 {
-    int number = QInputDialog::getInteger(0, tr("Move top cards to exile"), tr("Number:"));
-        if (!number)
+    int number =
+#if QT_VERSION < 0x050000
+    QInputDialog::getInteger(
+#else
+    QInputDialog::getInt(
+#endif
+    0, tr("Move top cards to exile"), tr("Number:"));
+    if (!number)
        return;

    const int maxCards = zones.value("deck")->getCards().size();
@ -914,7 +938,13 @@ void Player::actUntapAll()
 void Player::actRollDie()
 {
    bool ok;
-    int sides = QInputDialog::getInteger(0, tr("Roll die"), tr("Number of sides:"), 20, 2, 1000, 1, &ok);
+    int sides =
+#if QT_VERSION < 0x050000
+    QInputDialog::getInteger(
+#else
+    QInputDialog::getInt(
+#endif
+    0, tr("Roll die"), tr("Number of sides:"), 20, 2, 1000, 1, &ok);
    if (ok) {
        Command_RollDie cmd;
        cmd.set_sides(sides);
@ -2022,7 +2052,13 @@ void Player::actCardCounterTrigger()
        case 11: {
            bool ok;
            dialogSemaphore = true;
-            int number = QInputDialog::getInteger(0, tr("Set counters"), tr("Number:"), 0, 0, MAX_COUNTERS_ON_CARD, 1, &ok);
+            int number = 
+#if QT_VERSION < 0x050000
+                QInputDialog::getInteger(
+#else
+                QInputDialog::getInt(
+#endif
+                    0, tr("Set counters"), tr("Number:"), 0, 0, MAX_COUNTERS_ON_CARD, 1, &ok);
            dialogSemaphore = false;
            if (clearCardsToDelete())
                return;
--- a/cockatrice/src/playerlistwidget.cpp
+++ b/cockatrice/src/playerlistwidget.cpp
@ -72,7 +72,11 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient
    setColumnCount(6);
    setHeaderHidden(true);
    setRootIsDecorated(false);
+#if QT_VERSION < 0x050000
    header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
    retranslateUi();
 }

--- a/cockatrice/src/qt-json/json.cpp
+++ b/cockatrice/src/qt-json/json.cpp
@ -553,7 +553,7 @@ int Json::nextToken(const QString &json, int &index)

        QChar c = json[index];
        index++;
-        switch(c.toAscii())
+        switch(c.toLatin1())
        {
                case '{': return JsonTokenCurlyOpen;
                case '}': return JsonTokenCurlyClose;
--- a/cockatrice/src/remotedecklist_treewidget.cpp
+++ b/cockatrice/src/remotedecklist_treewidget.cpp
@ -258,8 +258,11 @@ void RemoteDeckList_TreeModel::deckListFinished(const Response &r)
 {
    const Response_DeckList &resp = r.GetExtension(Response_DeckList::ext);

+    beginResetModel();
+
    root->clearTree();
-    reset();
+
+    endResetModel();
    
    ServerInfo_DeckStorage_TreeItem tempRoot;
    tempRoot.set_id(0);
@ -280,7 +283,11 @@ RemoteDeckList_TreeWidget::RemoteDeckList_TreeWidget(AbstractClient *_client, QW
    setModel(proxyModel);
    connect(treeModel, SIGNAL(treeRefreshed()), this, SLOT(expandAll()));

+#if QT_VERSION < 0x050000
    header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
    setUniformRowHeights(true);
    setSortingEnabled(true);
    proxyModel->sort(0, Qt::AscendingOrder);
--- a/cockatrice/src/remotereplaylist_treewidget.cpp
+++ b/cockatrice/src/remotereplaylist_treewidget.cpp
@ -278,7 +278,11 @@ RemoteReplayList_TreeWidget::RemoteReplayList_TreeWidget(AbstractClient *_client
    proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
    setModel(proxyModel);

+#if QT_VERSION < 0x050000
    header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
    header()->setStretchLastSection(false);
    setUniformRowHeights(true);
    setSortingEnabled(true);
--- a/cockatrice/src/soundengine.cpp
+++ b/cockatrice/src/soundengine.cpp
@ -33,8 +33,13 @@ void SoundEngine::soundEnabledChanged()
    if (settingsCache->getSoundEnabled()) {
        qDebug("SoundEngine: enabling sound");
        QAudioFormat format;
+#if QT_VERSION < 0x050000
        format.setFrequency(44100);
        format.setChannels(1);
+#else
+        format.setSampleRate(44100);
+        format.setChannelCount(1);
+#endif
        format.setSampleSize(16);
        format.setCodec("audio/pcm");
        format.setByteOrder(QAudioFormat::LittleEndian);
--- a/cockatrice/src/tab_deck_editor.cpp
+++ b/cockatrice/src/tab_deck_editor.cpp
@ -134,7 +134,11 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
    deckView->setUniformRowHeights(true);
    deckView->setSortingEnabled(true);
    deckView->sortByColumn(1, Qt::AscendingOrder);
+#if QT_VERSION < 0x050000
    deckView->header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+    deckView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
    deckView->installEventFilter(&deckViewKeySignals);
    connect(deckView->selectionModel(), SIGNAL(currentRowChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(updateCardInfoRight(const QModelIndex &, const QModelIndex &)));
    connect(&deckViewKeySignals, SIGNAL(onEnter()), this, SLOT(actIncrement()));
--- a/cockatrice/src/tab_deck_storage.cpp
+++ b/cockatrice/src/tab_deck_storage.cpp
@ -38,7 +38,11 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_c
    localDirView->setColumnHidden(1, true);
    localDirView->setRootIndex(localDirModel->index(localDirModel->rootPath(), 0));
    localDirView->setSortingEnabled(true);
+#if QT_VERSION < 0x050000
    localDirView->header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+    localDirView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
    localDirView->header()->setSortIndicator(0, Qt::AscendingOrder);
    
    leftToolBar = new QToolBar;
--- a/cockatrice/src/tab_replays.cpp
+++ b/cockatrice/src/tab_replays.cpp
@ -36,7 +36,11 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client)
    localDirView->setColumnHidden(1, true);
    localDirView->setRootIndex(localDirModel->index(localDirModel->rootPath(), 0));
    localDirView->setSortingEnabled(true);
+#if QT_VERSION < 0x050000
    localDirView->header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+    localDirView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
    localDirView->header()->setSortIndicator(0, Qt::AscendingOrder);
    
    leftToolBar = new QToolBar;
--- a/cockatrice/src/tab_server.cpp
+++ b/cockatrice/src/tab_server.cpp
@ -28,11 +28,17 @@ RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent)
    roomList->setRootIsDecorated(false);
    roomList->setColumnCount(4);
    roomList->header()->setStretchLastSection(false);
+#if QT_VERSION < 0x050000
    roomList->header()->setResizeMode(0, QHeaderView::ResizeToContents);
    roomList->header()->setResizeMode(1, QHeaderView::Stretch);
    roomList->header()->setResizeMode(2, QHeaderView::ResizeToContents);
    roomList->header()->setResizeMode(3, QHeaderView::ResizeToContents);
-    
+#else
+    roomList->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    roomList->header()->setSectionResizeMode(1, QHeaderView::Stretch);
+    roomList->header()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
+    roomList->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
+#endif    
    joinButton = new QPushButton;
    connect(joinButton, SIGNAL(clicked()), this, SLOT(joinClicked()));
    QHBoxLayout *buttonLayout = new QHBoxLayout;
--- a/cockatrice/src/tablezone.cpp
+++ b/cockatrice/src/tablezone.cpp
@ -28,7 +28,11 @@ TableZone::TableZone(Player *_p, QGraphicsItem *parent)
    currentMinimumWidth = minWidth;

    setCacheMode(DeviceCoordinateCache);
+#if QT_VERSION < 0x050000
    setAcceptsHoverEvents(true);
+#else
+    setAcceptHoverEvents(true);
+#endif
 }

 void TableZone::updateBgPixmap()
--- a/cockatrice/src/userlist.cpp
+++ b/cockatrice/src/userlist.cpp
@ -216,7 +216,11 @@ UserList::UserList(TabSupervisor *_tabSupervisor, AbstractClient *_client, UserL
    
    userTree = new QTreeWidget;
    userTree->setColumnCount(3);
+#if QT_VERSION < 0x050000
    userTree->header()->setResizeMode(QHeaderView::ResizeToContents);
+#else
+    userTree->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
    userTree->setHeaderHidden(true);
    userTree->setRootIsDecorated(false);
    userTree->setIconSize(QSize(20, 12));