[vlc-devel] commit: [Qt] Win Compilation fix. (Jean-Baptiste Kempf )

git version control git at videolan.org
Mon Oct 20 17:04:15 CEST 2008


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Oct 20 17:03:57 2008 +0200| [41b3e1daced948f537c52209a9acdc2ce908687e] | committer: Jean-Baptiste Kempf 

[Qt] Win Compilation fix.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=41b3e1daced948f537c52209a9acdc2ce908687e
---

 modules/gui/qt4/qt4.cpp          |    6 +-----
 modules/gui/qt4/util/qvlcapp.hpp |    4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 57de94e..79b6821 100755
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -352,11 +352,7 @@ static void *Init( vlc_object_t *obj )
 #endif
 
     /* Start the QApplication here */
-#ifdef WIN32
-    WinQtApp *app = new WinQtApp( argc, argv , true );
-#else
-    QApplication *app = new QApplication( argc, argv , true );
-#endif
+    QVLCApp *app = new QVLCApp( argc, argv , true );
     p_intf->p_sys->p_app = app;
 
     p_intf->p_sys->mainSettings = new QSettings(
diff --git a/modules/gui/qt4/util/qvlcapp.hpp b/modules/gui/qt4/util/qvlcapp.hpp
index a5f77e9..3738c11 100644
--- a/modules/gui/qt4/util/qvlcapp.hpp
+++ b/modules/gui/qt4/util/qvlcapp.hpp
@@ -30,6 +30,10 @@
 
 class QVLCApp : public QApplication
 {
+public:
+    QVLCApp( int & argc, char ** argv, bool GUIenabled ) : QApplication( argc,
+            argv, GUIenabled ) {}
+
 #if defined(Q_WS_WIN)
 protected:
     virtual bool winEventFilter( MSG *msg, long *result )




More information about the vlc-devel mailing list