aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKel Modderman <kel@otaku42.de>2008-09-24 09:24:49 (GMT)
committerJouni Malinen <j@w1.fi>2008-09-24 09:24:49 (GMT)
commit0fae9ad39b7040af8d45f4531c9eb95d12e25fc9 (patch)
tree56bb7094b7deb834ed008611c0616fe49c7f0307
parent62b86dba6edc902501a7c6938d370f8a05db8af7 (diff)
downloadhostap-0fae9ad39b7040af8d45f4531c9eb95d12e25fc9.zip
hostap-0fae9ad39b7040af8d45f4531c9eb95d12e25fc9.tar.gz
hostap-0fae9ad39b7040af8d45f4531c9eb95d12e25fc9.tar.bz2
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>
-rw-r--r--wpa_supplicant/wpa_gui-qt4/eventhistory.ui2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/networkconfig.ui2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/scanresults.ui2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/userdatarequest.ui2
-rw-r--r--wpa_supplicant/wpa_gui-qt4/wpagui.ui2
5 files changed, 5 insertions, 5 deletions
diff --git a/wpa_supplicant/wpa_gui-qt4/eventhistory.ui b/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
index 427d830..afe9149 100644
--- 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>
diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
index 426ebf4..8ba1c3f 100644
--- 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>
diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.ui b/wpa_supplicant/wpa_gui-qt4/scanresults.ui
index 24ff280..81e405e 100644
--- 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>
diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui b/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui
index ea01721..1de2a26 100644
--- 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>
diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.ui b/wpa_supplicant/wpa_gui-qt4/wpagui.ui
index 5f24c00..0758ce6 100644
--- 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>