Compile fix for Open in Qt4

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index 87544fd627572b375adadc0823fb078126f2e751..38e1693cfdc22d9c19e10a862586063e71215709 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -47,7 +47,7 @@ void FileOpenPanel::sendUpdate()
 
 QString FileOpenPanel::getUpdatedMRL()
 {
-    return ui.fileInput->text();
+    return ui.fileInput->currentText();
 }
 
 /**************************************************************************

diff --git a/modules/gui/qt4/ui/file_open.ui b/modules/gui/qt4/ui/file_open.ui
index aff157596ae0aa624a2ce30c40af9f53793573bd..fa92fda057e383e8e6b51daf79c59f2a7eb81195 100644 (file)
--- a/modules/gui/qt4/ui/file_open.ui
+++ b/modules/gui/qt4/ui/file_open.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
+ <class>FileOpen</class>
+ <widget class="QWidget" name="FileOpen" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -238,7 +238,7 @@ p, li { white-space: pre-wrap; }
         </spacer>
        </item>
        <item>
-        <widget class="QComboBox" name="lineEdit" >
+        <widget class="QComboBox" name="fileInput" >
          <property name="sizePolicy" >
           <sizepolicy>
            <hsizetype>7</hsizetype>
@@ -294,19 +294,6 @@ p, li { white-space: pre-wrap; }
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
-    <widget class="Line" name="line_2" >
-     <property name="geometry" >
-      <rect>
-       <x>150</x>
-       <y>230</y>
-       <width>320</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="geometry" >
       <rect>
@@ -678,6 +665,19 @@ p, li { white-space: pre-wrap; }
       <string>Extra Audio</string>
      </property>
     </widget>
+    <widget class="Line" name="line_2" >
+     <property name="geometry" >
+      <rect>
+       <x>150</x>
+       <y>230</y>
+       <width>320</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
    </widget>
    <widget class="QWidget" name="tab_Disk" >
     <attribute name="title" >
@@ -885,7 +885,7 @@ p, li { white-space: pre-wrap; }
   </widget>
  </widget>
  <tabstops>
-  <tabstop>lineEdit</tabstop>
+  <tabstop>fileInput</tabstop>
   <tabstop>pushButton_3</tabstop>
   <tabstop>lineEdit_2</tabstop>
   <tabstop>pushButton_4</tabstop>