[PATCH 4/5] wpa_gui-qt4: remove qPixmapFromMimeSource from ui files
Kel Modderman
kel
Wed Sep 24 00:28:53 PDT 2008
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 at otaku42.de>
---
--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
+++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
@@ -52,7 +52,7 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<includes>
<include location="local" >wpamsg.h</include>
</includes>
--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
+++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
@@ -368,7 +368,7 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>ssidEdit</tabstop>
<tabstop>authSelect</tabstop>
--- a/wpa_supplicant/wpa_gui-qt4/scanresults.ui
+++ b/wpa_supplicant/wpa_gui-qt4/scanresults.ui
@@ -88,7 +88,7 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
--- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui
+++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui
@@ -105,5 +105,5 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
</ui>
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui
@@ -410,7 +410,7 @@
</action>
</widget>
<layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<includes>
<include location="global" >qtimer.h</include>
<include location="global" >qsocketnotifier.h</include>
---
More information about the Hostap
mailing list