Mercurial > hg > sonic-visualiser
diff main/PreferencesDialog.cpp @ 547:8103ad8eef87
Merge from qt5 branch. Next release will require qt5
author | Chris Cannam |
---|---|
date | Thu, 09 May 2013 17:20:24 +0100 |
parents | e5e6625deb85 |
children | ba338234c001 86d1f640ae1e |
line wrap: on
line diff
--- a/main/PreferencesDialog.cpp Tue Apr 16 15:21:47 2013 +0100 +++ b/main/PreferencesDialog.cpp Thu May 09 17:20:24 2013 +0100 @@ -42,8 +42,8 @@ #include "audioio/AudioTargetFactory.h" #include "base/ResourceFinder.h" -PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WFlags flags) : - QDialog(parent, flags), +PreferencesDialog::PreferencesDialog(QWidget *parent) : + QDialog(parent), m_audioDevice(0), m_changesOnRestart(false) {