From 0fae9ad39b7040af8d45f4531c9eb95d12e25fc9 Mon Sep 17 00:00:00 2001 From: Kel Modderman Date: Wed, 24 Sep 2008 12:24:49 +0300 Subject: [PATCH] wpa_gui-qt4: remove qPixmapFromMimeSource from ui files When integrating the new art, this UI entry: qPixmapFromMimeSource 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 --- wpa_supplicant/wpa_gui-qt4/eventhistory.ui | 2 +- wpa_supplicant/wpa_gui-qt4/networkconfig.ui | 2 +- wpa_supplicant/wpa_gui-qt4/scanresults.ui | 2 +- wpa_supplicant/wpa_gui-qt4/userdatarequest.ui | 2 +- wpa_supplicant/wpa_gui-qt4/wpagui.ui | 2 +- 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 427d830cd..afe9149cf 100644 --- a/wpa_supplicant/wpa_gui-qt4/eventhistory.ui +++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.ui @@ -52,7 +52,7 @@ - qPixmapFromMimeSource + wpamsg.h diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui index 426ebf430..8ba1c3f39 100644 --- a/wpa_supplicant/wpa_gui-qt4/networkconfig.ui +++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.ui @@ -368,7 +368,7 @@ - qPixmapFromMimeSource + ssidEdit authSelect diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.ui b/wpa_supplicant/wpa_gui-qt4/scanresults.ui index 24ff2808d..81e405efc 100644 --- a/wpa_supplicant/wpa_gui-qt4/scanresults.ui +++ b/wpa_supplicant/wpa_gui-qt4/scanresults.ui @@ -88,7 +88,7 @@ - qPixmapFromMimeSource + diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui b/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui index ea0172194..1de2a26da 100644 --- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui +++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui @@ -105,5 +105,5 @@ - qPixmapFromMimeSource + diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.ui b/wpa_supplicant/wpa_gui-qt4/wpagui.ui index 5f24c00ce..0758ce6ad 100644 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui @@ -410,7 +410,7 @@ - qPixmapFromMimeSource + qtimer.h qsocketnotifier.h