From 7132c010391ab2c56e506e842585ab69b7f6c9e2 2012-11-06 10:34:24
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-11-06 10:34:24
Subject: [PATCH] Qt5 build fixes

---

diff --git a/demos/audio/widget.cpp b/demos/audio/widget.cpp
index bce89be..0d16b9d 100644
--- a/demos/audio/widget.cpp
+++ b/demos/audio/widget.cpp
@@ -39,8 +39,8 @@ Widget::Widget(QWidget *parent)
     setLayout(mainLayout);
 
     QAudioFormat formatAudio;
-    formatAudio.setFrequency(8000);
-    formatAudio.setChannels(1);
+    formatAudio.setSampleRate(8000);
+    formatAudio.setChannelCount(1);
     formatAudio.setSampleSize(8);
     formatAudio.setCodec("audio/pcm");
     formatAudio.setByteOrder(QAudioFormat::LittleEndian);
diff --git a/demos/demoLauncher/widget.cpp b/demos/demoLauncher/widget.cpp
index f7b4e32..f7fbe2e 100644
--- a/demos/demoLauncher/widget.cpp
+++ b/demos/demoLauncher/widget.cpp
@@ -13,13 +13,13 @@ Widget::Widget(QWidget *parent)
     // Create a list of executables
     QList<QFileInfo> appList;
     m_appFolder = QDir(QApplication::applicationDirPath());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     // The executable is inside an application bundle (a folder) on OSX
     m_appFolder.cdUp();
     m_appFolder.cdUp();
     m_appFolder.cdUp();
     appList = m_appFolder.entryInfoList(QStringList("*.app"), QDir::Executable | QDir::Dirs | QDir::NoDotAndDotDot);
-#elif defined(Q_WS_WIN)
+#elif defined(Q_OS_WIN)
     appList = m_appFolder.entryInfoList(QStringList("*.exe"), QDir::Executable | QDir::Files | QDir::NoDotAndDotDot);
 #else
     appList = m_appFolder.entryInfoList(QDir::Executable | QDir::Files | QDir::NoDotAndDotDot);