diff main/PreferencesDialog.h @ 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.h	Tue Apr 16 15:21:47 2013 +0100
+++ b/main/PreferencesDialog.h	Thu May 09 17:20:24 2013 +0100
@@ -31,7 +31,7 @@
     Q_OBJECT
 
 public:
-    PreferencesDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
+    PreferencesDialog(QWidget *parent = 0);
     virtual ~PreferencesDialog();
 
     enum Tab {