Merge remote-tracking branch 'upstream/master' into message_log

Conflicts:
	servatrice/CMakeLists.txt

oracle/CMakeLists.txt

@@ -138,17 +138,12 @@ if(APPLE)
     set(plugin_dest_dir oracle.app/Contents/Plugins)
     set(qtconf_dest_dir oracle.app/Contents/Resources)
 
-    # note: no codecs in qt5
-    # note: phonon_backend => mediaservice
-    # note: needs platform on osx
+    # qt4: codecs, iconengines, imageformats
+    # qt5: iconengines, platforms
 
-    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)/.*_debug\\.dylib")
-    else()
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/[^_]*\\.dylib")
-    endif()
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(codecs|iconengines|platforms)/.*\\.dylib"
+        REGEX ".*_debug\\.dylib" EXCLUDE)
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -170,17 +165,11 @@ IF(WIN32)
     set(plugin_dest_dir Plugins)
     set(qtconf_dest_dir .)
 
-    # note: no codecs in qt5
-    # note: phonon_backend => mediaservice
-    # note: needs platform on osx
+    # qt4: codecs, iconengines, imageformats
+    # qt5: iconengines, imageformats, platforms
 
-    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(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(codecs|iconengines|platforms)/.*[^d]\\.dll")
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]

oracle/src/oracleimporter.cpp

@@ -40,6 +40,9 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
         editionLong = map.value("name").toString();
         editionCards = map.value("cards");
         setType = map.value("type").toString();
+        // capitalize set type
+        if(setType.length() > 0)
+            setType[0] = setType[0].toUpper();
         releaseDate = map.value("releaseDate").toDate();
 
         // core and expansion sets are marked to be imported by default
@@ -236,7 +239,7 @@ int OracleImporter::startImport()
     const SetToDownload * curSet;
 
     // add an empty set for tokens
-    CardSet *tokenSet = new CardSet(TOKENS_SETNAME, tr("Dummy set containing tokens"), "tokens");
+    CardSet *tokenSet = new CardSet(TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens");
     sets.insert(TOKENS_SETNAME, tokenSet);
 
     while (it.hasNext())

oracle/src/oracleimporter.h

@@ -21,7 +21,7 @@ public:
     bool getImport() const { return import; }
     void setImport(bool _import) { import = _import; }
     SetToDownload(const QString &_shortName, const QString &_longName, const QVariant &_cards, bool _import, const QString &_setType = QString(), const QDate &_releaseDate = QDate())
-        : shortName(_shortName), longName(_longName), import(_import), cards(_cards), setType(_setType), releaseDate(_releaseDate)  { }
+        : shortName(_shortName), longName(_longName), import(_import), cards(_cards), releaseDate(_releaseDate), setType(_setType)  { }
     bool operator<(const SetToDownload &set) const { return longName.compare(set.longName, Qt::CaseInsensitive) < 0; }
 };
 

servatrice/CMakeLists.txt

@@ -139,17 +139,12 @@ if(APPLE)
     set(plugin_dest_dir servatrice.app/Contents/Plugins)
     set(qtconf_dest_dir servatrice.app/Contents/Resources)
 
-    # note: no codecs in qt5
-    # note: phonon_backend => mediaservice
-    # note: needs platform on osx
+    # qt4: codecs, sqldrivers
+    # qt5: platforms, sqldrivers
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(sqldrivers|platforms)/.*_debug\\.dylib")
-    else()
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(sqldrivers|platforms)/[^_]*\\.dylib")
-    endif()
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(codecs|platforms|sqldrivers)/.*\\.dylib"
+        REGEX ".*_debug\\.dylib" EXCLUDE)
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -171,17 +166,11 @@ if(WIN32)
     set(plugin_dest_dir Plugins)
     set(qtconf_dest_dir .)
 
-    # note: no codecs in qt5
-    # note: phonon_backend => mediaservice
-    # note: needs platform on osx
+    # qt4: codecs, sqldrivers
+    # qt5: platforms, sqldrivers
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(sqldrivers|platforms)/.*d\\.dll")
-    else()
-        install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-            FILES_MATCHING REGEX "(sqldrivers|platforms)/.*[^d]\\.dll")
-    endif()
+    install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
+        FILES_MATCHING REGEX "(codecs|platforms|sqldrivers)/.*[^d]\\.dll")
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]

servatrice/src/servatrice.cpp

@@ -108,7 +108,11 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor)
     QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(int, socketDescriptor));
 }
 
+#if QT_VERSION < 0x050000
 void Servatrice_IslServer::incomingConnection(int socketDescriptor)
+#else
+void Servatrice_IslServer::incomingConnection(qintptr socketDescriptor)
+#endif
 {
     QThread *thread = new QThread;
     connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));