diff --git a/src/libtomahawk/TomahawkSettings.h b/src/libtomahawk/TomahawkSettings.h index 716298e7d..9047c7da8 100644 --- a/src/libtomahawk/TomahawkSettings.h +++ b/src/libtomahawk/TomahawkSettings.h @@ -243,7 +243,7 @@ public: signals: void changed(); - void recentlyPlayedPlaylistAdded( const QString& playlistId, int sourceId ); + void recentlyPlayedPlaylistAdded( const QString& playlistId, int sourceId ); private slots: void updateIndex(); diff --git a/src/tomahawk/main.cpp b/src/tomahawk/main.cpp index 97bba964e..6ef2ca09b 100644 --- a/src/tomahawk/main.cpp +++ b/src/tomahawk/main.cpp @@ -46,6 +46,7 @@ #ifdef Q_OS_WIN #include + // code from patch attached to QTBUG-19064 by Honglei Zhang LRESULT QT_WIN_CALLBACK qt_LowLevelKeyboardHookProc( int nCode, WPARAM wParam, LPARAM lParam ); HHOOK hKeyboardHook; @@ -93,6 +94,7 @@ LRESULT QT_WIN_CALLBACK qt_LowLevelKeyboardHookProc( int nCode, WPARAM wParam, L return CallNextHookEx( 0, nCode, wParam, lParam ); } + #include #define argc __argc #define argv __argv @@ -125,6 +127,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine } #else // Q_OS_WIN + int main( int argc, char *argv[] ) {