mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-03-21 16:29:43 +01:00
* Fixed cross compiling with MinGW.
This commit is contained in:
parent
db4437cf62
commit
74d52e3208
@ -4,7 +4,7 @@ SET( QT_USE_QTGUI TRUE )
|
||||
SET( QT_USE_QTSQL TRUE )
|
||||
SET( QT_USE_QTNETWORK TRUE )
|
||||
SET( QT_USE_QTXML TRUE )
|
||||
SET( QT_USE_QTUITOOLS TRUE )
|
||||
SET( QT_USE_UITOOLS TRUE )
|
||||
|
||||
include( ${QT_USE_FILE} )
|
||||
|
||||
@ -489,7 +489,6 @@ target_link_libraries( tomahawklib
|
||||
${LIBECHONEST_LIBRARY}
|
||||
${QT_QTUITOOLS_LIBRARY}
|
||||
${QT_LIBRARIES}
|
||||
${QT_QTUITOOLS_LIBRARY} # We really need to link twice against it for windows, maybe QTBUG-20498 is related
|
||||
${OS_SPECIFIC_LINK_LIBRARIES}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${LINK_LIBRARIES}
|
||||
|
@ -20,6 +20,8 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <QPluginLoader>
|
||||
#include <QDir>
|
||||
#include <QMetaType>
|
||||
@ -303,6 +305,7 @@ TomahawkApp::instance()
|
||||
return (TomahawkApp*)TOMAHAWK_APPLICATION::instance();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
TomahawkApp::printHelp()
|
||||
{
|
||||
@ -318,6 +321,7 @@ TomahawkApp::printHelp()
|
||||
std::cout << QString( "For more documentation, see http://wiki.tomahawk-player.org/mediawiki/index.php/Tomahawk://_Links\n" ).toAscii().data();
|
||||
}
|
||||
|
||||
|
||||
#ifndef TOMAHAWK_HEADLESS
|
||||
AudioControls*
|
||||
TomahawkApp::audioControls()
|
||||
|
Loading…
x
Reference in New Issue
Block a user