Browse Source

wpa_gui-qt4: remove qPixmapFromMimeSource from ui files

When integrating the new art, this UI entry:

<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>

Caused the following error:

.obj/wpagui.o: In function `Ui_WpaGui::setupUi(QMainWindow*)':
wpagui.cpp:(.text._ZN9Ui_WpaGui7setupUiEP11QMainWindow[Ui_WpaGui::setupUi(QMainWindow*)]+0xd3): undefined reference to `qPixmapFromMimeSource(QString const&)'
collect2: ld returned 1 exit status

Removing qPixmapFromMimeSource seems to have no unwanted side effects, and
allows successful build again. Research leads me to believe it depends on
Qt3Support, which we do not want.

Signed-off-by: Kel Modderman <kel@otaku42.de>
Kel Modderman 16 years ago
parent
commit
0fae9ad39b

+ 1 - 1
wpa_supplicant/wpa_gui-qt4/eventhistory.ui

@@ -52,7 +52,7 @@
   </layout>
   </layout>
  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
  <includes>
  <includes>
   <include location="local" >wpamsg.h</include>
   <include location="local" >wpamsg.h</include>
  </includes>
  </includes>

+ 1 - 1
wpa_supplicant/wpa_gui-qt4/networkconfig.ui

@@ -368,7 +368,7 @@
   </layout>
   </layout>
  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
  <tabstops>
  <tabstops>
   <tabstop>ssidEdit</tabstop>
   <tabstop>ssidEdit</tabstop>
   <tabstop>authSelect</tabstop>
   <tabstop>authSelect</tabstop>

+ 1 - 1
wpa_supplicant/wpa_gui-qt4/scanresults.ui

@@ -88,7 +88,7 @@
   </layout>
   </layout>
  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
  <resources/>
  <resources/>
  <connections/>
  <connections/>
 </ui>
 </ui>

+ 1 - 1
wpa_supplicant/wpa_gui-qt4/userdatarequest.ui

@@ -105,5 +105,5 @@
     </layout>
     </layout>
   </widget>
   </widget>
   <layoutdefault spacing="6" margin="11" />
   <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <pixmapfunction></pixmapfunction>
 </ui>
 </ui>

+ 1 - 1
wpa_supplicant/wpa_gui-qt4/wpagui.ui

@@ -410,7 +410,7 @@
   </action>
   </action>
  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
  <includes>
  <includes>
   <include location="global" >qtimer.h</include>
   <include location="global" >qtimer.h</include>
   <include location="global" >qsocketnotifier.h</include>
   <include location="global" >qsocketnotifier.h</include>