From 74d52e320853b7b5c2963e907defb4cbf20a53af Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 13 Aug 2011 05:58:05 +0200 Subject: [PATCH] * Fixed cross compiling with MinGW. --- src/libtomahawk/CMakeLists.txt | 3 +-- src/tomahawkapp.cpp | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 1add45b16..4e97c6f43 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -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} diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index be2a680eb..c5e224b4e 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -20,6 +20,8 @@ #include "config.h" +#include + #include #include #include @@ -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()