Commit b59b8144 authored by Urs Fleisch's avatar Urs Fleisch
Browse files

Windows Qt5: Fix installation, workarounds for Qt bugs.

parent fbcb447a
......@@ -97,7 +97,7 @@ set(CPACK_PACKAGE_VERSION_MINOR 2)
set(CPACK_PACKAGE_VERSION_PATCH 0)
set(KID3_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
#set(CPACK_PACKAGE_VERSION ${KID3_VERSION})
set(CPACK_PACKAGE_VERSION "git20150213")
set(CPACK_PACKAGE_VERSION "git20150223")
set(RELEASE_YEAR 2015)
# Platform specific default installation paths
......
......@@ -49,7 +49,7 @@ test ${kernel:0:5} = "MINGW" && kernel="MINGW"
compiler="gcc"
qt_version=4.8.6
qt_version=5.4.0
zlib_version=1.2.8
zlib_patchlevel=2
libogg_version=1.3.2
......@@ -2163,7 +2163,7 @@ if test $kernel = "Linux"; then
mkdir kid3
if test "$compiler" = "cross-mingw"; then
cat >kid3/build.sh <<EOF
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=$thisdir/source/mingw.cmake -DCMAKE_INSTALL_PREFIX= -DWITH_FFMPEG=ON -DWITH_MP4V2=ON -DCMAKE_CXX_FLAGS="-g -O2 -DMP4V2_USE_STATIC_LIB" -DDOCBOOK_XSL_DIR=/usr/share/xml/docbook/stylesheet/nwalsh ../../kid3
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$thisdir/source/mingw.cmake -DCMAKE_INSTALL_PREFIX= -DWITH_FFMPEG=ON -DWITH_MP4V2=ON -DCMAKE_CXX_FLAGS="-g -O2 -DMP4V2_USE_STATIC_LIB" -DDOCBOOK_XSL_DIR=/usr/share/xml/docbook/stylesheet/nwalsh ../../kid3
EOF
cat >kid3/make_package.sh <<"EOF"
#!/bin/sh
......@@ -2180,7 +2180,7 @@ echo "### Ignore make error"
cp -f po/*.qm doc/*/kid3*.html $INSTDIR
for f in Qt5Core.dll Qt5Network.dll Qt5Gui.dll Qt5Xml.dll Qt5Widgets.dll Qt5Multimedia.dll Qt5Qml.dll Qt5Quick.dll libgcc_s_dw2-1.dll libstdc++-6.dll libwinpthread-1.dll icuin53.dll icuuc53.dll icudt53.dll; do
for f in Qt5Core.dll Qt5Network.dll Qt5Gui.dll Qt5Xml.dll Qt5Widgets.dll Qt5Multimedia.dll Qt5Qml.dll Qt5Quick.dll libgcc_s_dw2-1.dll libstdc++-6.dll libwinpthread-1.dll; do
cp $QT_BIN_DIR/$f $INSTDIR
done
......
kid3 (3.2.0~git20150124) unstable; urgency=low
kid3 (3.2.0~git20150223) unstable; urgency=low
* Internal test release.
......
......@@ -34,6 +34,12 @@
#include "coreplatformtools.h"
#include "kid3application.h"
#if defined Q_OS_WIN32 && defined Q_CC_MINGW && QT_VERSION >= 0x050000 && QT_VERSION < 0x050500
// Disable command line globbing to avoid crash in QCoreApplication::arguments()
// QTBUG-30330
int _CRT_glob = 0;
#endif
/**
* Main program for command line interface.
*
......
......@@ -211,5 +211,12 @@ if (WIN32)
"${QT_BINARY_DIR}/libwinpthread-1.dll"
"${QT_BINARY_DIR}/libiconv-2.dll"
DESTINATION ${WITH_BINDIR})
else (NOT HAVE_QT5)
# Use reduced size ICU libraries, QTBUG-29828, QTBUG-38259.
# A folder with reduced ICU libraries can be copied to the Qt bin directory.
get_target_property(_qtBinDir Qt5::qmake LOCATION)
get_filename_component(_qtBinDir ${_qtBinDir} PATH)
install(DIRECTORY "${_qtBinDir}/icu_reduced/"
DESTINATION ${WITH_BINDIR} OPTIONAL)
endif (NOT HAVE_QT5)
endif (WIN32)
......@@ -24,8 +24,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef QT_NO_DEBUG
#include "debugutils.h"
#include <QMetaObject>
#include <QMetaMethod>
......@@ -46,6 +44,8 @@ DebugUtils::SignalEmissionDumper::~SignalEmissionDumper()
{
}
#ifndef QT_NO_DEBUG
/**
* Monitor signal emissions of object
* @param obj object to monitor
......@@ -149,4 +149,9 @@ void DebugUtils::dumpModel(const QAbstractItemModel& model,
}
}
#else
void DebugUtils::SignalEmissionDumper::connectObject(QObject*) {}
void DebugUtils::SignalEmissionDumper::printSignal() {}
#endif
......@@ -24,11 +24,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef QT_NO_DEBUG
#ifndef DEBUGUTILS_H
#define DEBUGUTILS_H
#include <QObject>
#include <QModelIndex>
#include "kid3api.h"
......@@ -63,6 +62,8 @@ private slots:
void printSignal();
};
#ifndef QT_NO_DEBUG
/**
* Dump an item model.
* @param model item model to dump
......@@ -72,9 +73,8 @@ private slots:
void KID3_CORE_EXPORT dumpModel(const QAbstractItemModel& model,
const QModelIndex& parent = QModelIndex(), int indent = 0);
#endif
}
#endif // DEBUGUTILS_H
#endif // QT_NO_DEBUG
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment