github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 12:59:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

cannot seem to get uic to work for ...

Browse source 
... different qt versions in the make file correctly...
so, make the ui_overlays.h file version generic.  maybe...
This commit is contained in:
marshmellow42 2017-04-15 13:40:49 -04:00
commit b760f0ffd8
2 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/Makefile
View file

@ -162,7 +162,8 @@ ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
BINS = proxmark3 flasher fpga_compress BINS = proxmark3 flasher fpga_compress
WINBINS = $(patsubst %, %.exe, $(BINS)) 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) all: lua_build $(BINS)
@ -182,8 +183,9 @@ fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
proxguiqt.moc.cpp: proxguiqt.h proxguiqt.moc.cpp: proxguiqt.h
$(MOC) -o$@ $^ $(MOC) -o$@ $^
ui/ui_overlays.h: ./ui/overlays.ui #cannot seem to get this to work accross qt versions...
$(UIC) $^ > $@ #ui/ui_overlays.h: ./ui/overlays.ui
# $(UIC) $^ > $@
lualibs/usb_cmd.lua: ../include/usb_cmd.h lualibs/usb_cmd.lua: ../include/usb_cmd.h
awk -f usb_cmd_h2lua.awk $^ > $@ awk -f usb_cmd_h2lua.awk $^ > $@

46
client/ui/ui_overlays.h
View file

@ -10,19 +10,19 @@
#define OVERLAYS_H #define OVERLAYS_H
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QAction> #include <QAction>
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QButtonGroup> #include <QButtonGroup>
#include <QtGui/QFormLayout> #include <QFormLayout>
#include <QtGui/QHBoxLayout> #include <QHBoxLayout>
#include <QtGui/QHeaderView> #include <QHeaderView>
#include <QtGui/QLabel> #include <QLabel>
#include <QtGui/QPushButton> #include <QPushButton>
#include <QtGui/QSlider> #include <QSlider>
#include <QtGui/QSpacerItem> #include <QSpacerItem>
#include <QtGui/QTabWidget> #include <QTabWidget>
#include <QtGui/QVBoxLayout> #include <QVBoxLayout>
#include <QtGui/QWidget> #include <QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -236,20 +236,20 @@ public:
void retranslateUi(QWidget *Form) 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_5->setText(QString());
label->setText(QApplication::translate("Form", "Window size", 0, QApplication::UnicodeUTF8)); label->setText(QApplication::translate("Form", "Window size", 0));
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab), QApplication::translate("Form", "Autocorrelate", 0, QApplication::UnicodeUTF8)); tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab), QApplication::translate("Form", "Autocorrelate", 0));
label_8->setText(QApplication::translate("Form", "Edge Jump Threshold", 0, QApplication::UnicodeUTF8)); label_8->setText(QApplication::translate("Form", "Edge Jump Threshold", 0));
label_9->setText(QString()); label_9->setText(QString());
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "AskEdge", 0, QApplication::UnicodeUTF8)); tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "AskEdge", 0));
label_2->setText(QApplication::translate("Form", "Up", 0, QApplication::UnicodeUTF8)); label_2->setText(QApplication::translate("Form", "Up", 0));
label_6->setText(QString()); 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()); label_7->setText(QString());
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_2), QApplication::translate("Form", "Dirthreshold", 0, QApplication::UnicodeUTF8)); tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_2), QApplication::translate("Form", "Dirthreshold", 0));
pushButton_apply->setText(QApplication::translate("Form", "Apply", 0, QApplication::UnicodeUTF8)); pushButton_apply->setText(QApplication::translate("Form", "Apply", 0));
pushButton_sticky->setText(QApplication::translate("Form", "Restore", 0, QApplication::UnicodeUTF8)); pushButton_sticky->setText(QApplication::translate("Form", "Restore", 0));
label_4->setText(QString()); label_4->setText(QString());
} // retranslateUi } // retranslateUi