From: marshmellow42 Date: Sat, 15 Apr 2017 17:40:49 +0000 (-0400) Subject: cannot seem to get uic to work for ... X-Git-Tag: v3.0.0~12^2~7 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b760f0ffd8358bbea7e0a5c24a576ca8efdeda44 cannot seem to get uic to work for ... ... different qt versions in the make file correctly... so, make the ui_overlays.h file version generic. maybe... --- diff --git a/client/Makefile b/client/Makefile index 2f853093..82697612 100644 --- a/client/Makefile +++ b/client/Makefile @@ -162,7 +162,8 @@ ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o) BINS = proxmark3 flasher fpga_compress WINBINS = $(patsubst %, %.exe, $(BINS)) -CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp ./ui/ui_overlays.h +CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp +#./ui/ui_overlays.h all: lua_build $(BINS) @@ -182,8 +183,9 @@ fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS) proxguiqt.moc.cpp: proxguiqt.h $(MOC) -o$@ $^ -ui/ui_overlays.h: ./ui/overlays.ui - $(UIC) $^ > $@ +#cannot seem to get this to work accross qt versions... +#ui/ui_overlays.h: ./ui/overlays.ui +# $(UIC) $^ > $@ lualibs/usb_cmd.lua: ../include/usb_cmd.h awk -f usb_cmd_h2lua.awk $^ > $@ diff --git a/client/ui/ui_overlays.h b/client/ui/ui_overlays.h index a0dc3223..ff0665e5 100644 --- a/client/ui/ui_overlays.h +++ b/client/ui/ui_overlays.h @@ -10,19 +10,19 @@ #define OVERLAYS_H #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE @@ -236,20 +236,20 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Overlays", 0, QApplication::UnicodeUTF8)); + Form->setWindowTitle(QApplication::translate("Form", "Overlays", 0)); label_5->setText(QString()); - label->setText(QApplication::translate("Form", "Window size", 0, QApplication::UnicodeUTF8)); - tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab), QApplication::translate("Form", "Autocorrelate", 0, QApplication::UnicodeUTF8)); - label_8->setText(QApplication::translate("Form", "Edge Jump Threshold", 0, QApplication::UnicodeUTF8)); + label->setText(QApplication::translate("Form", "Window size", 0)); + tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab), QApplication::translate("Form", "Autocorrelate", 0)); + label_8->setText(QApplication::translate("Form", "Edge Jump Threshold", 0)); label_9->setText(QString()); - tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "AskEdge", 0, QApplication::UnicodeUTF8)); - label_2->setText(QApplication::translate("Form", "Up", 0, QApplication::UnicodeUTF8)); + tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "AskEdge", 0)); + label_2->setText(QApplication::translate("Form", "Up", 0)); label_6->setText(QString()); - label_3->setText(QApplication::translate("Form", "Down", 0, QApplication::UnicodeUTF8)); + label_3->setText(QApplication::translate("Form", "Down", 0)); label_7->setText(QString()); - tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_2), QApplication::translate("Form", "Dirthreshold", 0, QApplication::UnicodeUTF8)); - pushButton_apply->setText(QApplication::translate("Form", "Apply", 0, QApplication::UnicodeUTF8)); - pushButton_sticky->setText(QApplication::translate("Form", "Restore", 0, QApplication::UnicodeUTF8)); + tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_2), QApplication::translate("Form", "Dirthreshold", 0)); + pushButton_apply->setText(QApplication::translate("Form", "Apply", 0)); + pushButton_sticky->setText(QApplication::translate("Form", "Restore", 0)); label_4->setText(QString()); } // retranslateUi