Update:

- Add support for both Qt4 and Qt5
- Remove embedded-server application - no use
- Update build scripts - fix dependencies checks for win32

debian/control.qt5

@@ -8,7 +8,7 @@ Homepage: https://code.google.com/p/qt-webkit-kiosk/
 
 Package: qt-webkit-kiosk
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, phonon-backend-gstreamer
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: It's one-window browser writen on Qt5 & QtWebkit
  This is simple browser written on Qt5 & QtWebkit.
  Usualy runing in fullscreen mode, but supports maximized and fixed size window mode.

setup.pro

@@ -12,6 +12,7 @@ CONFIG(debug, debug|release) {
     message(Debug build)
 } else {
 # here comes release specific statements
+    message(Release build)
     CONFIG -= debug
     DEFINES += QT_NO_DEBUG_OUTPUT
 }

src/anyoption.cpp

@@ -391,7 +391,7 @@ AnyOption::useCommandArgs( int _argc, QStringList _argv)
 }
 
 void
-AnyOption::useFiileName( const char *_filename )
+AnyOption::useFileName( const char *_filename )
 {
 	filename = _filename;
 	file_set = true;
@@ -952,7 +952,7 @@ AnyOption::processFile()
 bool
 AnyOption::processFile( const char *filename )
 {
-	useFiileName(filename );
+    useFileName(filename );
 	return ( processFile() );
 }
 

src/mainwindow.cpp

@@ -855,9 +855,6 @@ void MainWindow::attachJavascripts()
     QString file_name;
     quint32 countScripts = 0;
 
-    QWebElement bodyElem = view->page()->mainFrame()->findFirstElement("body");
-    QString content = "";
-
     while (scriptsIterator.hasNext()) {
         file_name = scriptsIterator.next();
 
@@ -911,9 +908,6 @@ void MainWindow::attachStyles()
     QFileInfo finfo = QFileInfo();
     quint32 countStyles = 0;
 
-    QWebElement headElem = view->page()->mainFrame()->findFirstElement("head");
-    QString content = "";
-
     while (stylesIterator.hasNext()) {
         file_name = stylesIterator.next();
 

src/player/multimedia.cpp

@@ -1,5 +1,5 @@
 #include "config.h"
-#include "qplayer.h"
+#include "multimedia.h"
 
 QPlayer::QPlayer()
 {

src/player/multimedia.h

@@ -1,8 +1,15 @@
-#ifndef QPLAYER_H
-#define QPLAYER_H
+#ifndef QPLAYER_MULTIMEDIA_H
+#define QPLAYER_MULTIMEDIA_H
+
+/**
+ * Sould be used only with Qt-5.0+
+ * Qt 4 don't have MediaPlayer
+ */
 
 #include <QtCore>
+#ifdef QT5
 #include <QtMultimedia/QMediaPlayer>
+#endif
 
 class QPlayer : public QObject
 {
@@ -21,4 +28,4 @@ class QPlayer : public QObject
 
 };
 
-#endif // QPLAYER_H
+#endif // QPLAYER_MULTIMEDIA_H

src/player/null.cpp

@@ -7,4 +7,5 @@ QPlayer::QPlayer()
 
 void QPlayer::play(QString soundFile)
 {
+    Q_UNUSED(soundFile);
 }