Compilation error when PHONON not present
This commit is contained in:
@@ -49,10 +49,13 @@ void RepeatComboBox::update()
|
|||||||
|
|
||||||
CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
|
CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
|
||||||
ModelPanel(parent, model, generalSettings),
|
ModelPanel(parent, model, generalSettings),
|
||||||
initialized(false),
|
initialized(false)
|
||||||
|
#if defined(PHONON)
|
||||||
|
,
|
||||||
phononCurrent(-1),
|
phononCurrent(-1),
|
||||||
clickObject(NULL),
|
clickObject(NULL),
|
||||||
clickOutput(NULL)
|
clickOutput(NULL)
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
QGridLayout * gridLayout = new QGridLayout(this);
|
QGridLayout * gridLayout = new QGridLayout(this);
|
||||||
|
|
||||||
|
|||||||
@@ -45,9 +45,9 @@ class CustomFunctionsPanel : public ModelPanel
|
|||||||
void customFunctionEdited();
|
void customFunctionEdited();
|
||||||
void fsw_customContextMenuRequested(QPoint pos);
|
void fsw_customContextMenuRequested(QPoint pos);
|
||||||
void refreshCustomFunction(int index, bool modified=false);
|
void refreshCustomFunction(int index, bool modified=false);
|
||||||
void playMusic();
|
|
||||||
void onChildModified();
|
void onChildModified();
|
||||||
#ifdef PHONON
|
#ifdef PHONON
|
||||||
|
void playMusic();
|
||||||
void mediaPlayer_state(Phonon::State newState, Phonon::State oldState);
|
void mediaPlayer_state(Phonon::State newState, Phonon::State oldState);
|
||||||
#endif
|
#endif
|
||||||
void fswDelete();
|
void fswDelete();
|
||||||
|
|||||||
Reference in New Issue
Block a user