1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00

Merge remote-tracking branch 'origin' into phonon

This commit is contained in:
Christian Muehlhaeuser
2011-03-16 16:38:21 +01:00

View File

@@ -8,6 +8,8 @@
#include "boost/function.hpp"
#include "boost/bind.hpp"
#include "dllmacro.h"
/*
I want to do:
QTimer::singleShot(1000, this, SLOT(doSomething(x)));
@@ -18,7 +20,7 @@
namespace Tomahawk
{
class FuncTimeout : public QObject
class DLLEXPORT FuncTimeout : public QObject
{
Q_OBJECT