From 9ce91f5128618b398e8b49849672e2833262cb5f Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 21 Jun 2011 17:42:32 +0200 Subject: removed unneeded include --- .gitignore | 4 ++++ CMakeLists.txt | 6 ++++++ build.sh | 1 - src/sysinfo.h | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a39b01f..550ba11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ +fbgui build +moc_* +qrc_* +*.o Makefile .cproject .project diff --git a/CMakeLists.txt b/CMakeLists.txt index d9411fd..9bc48cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,12 @@ add_definitions(${QT_DEFINITIONS}) link_directories(/usr/local/Qxt/lib /usr/lib) +#add_library( +# /usr/local/Qxt/lib/libQxtCore.so +# /usr/lib/libqjson.so +# /usr/lib/libusb-1.0.a +# ) + QT4_ADD_RESOURCES(FBGUI_RC_SOURCES ${FBGUI_RCS}) QT4_WRAP_UI(FBGUI_UI_HEADERS ${FBGUI_UIS}) QT4_WRAP_CPP(FBGUI_MOC_SOURCES ${FBGUI_MOC_HEADERS}) diff --git a/build.sh b/build.sh index cda70f2..0d6f4eb 100755 --- a/build.sh +++ b/build.sh @@ -8,7 +8,6 @@ if [ "$1" = "--clean" ] then rm -rf $BUILDDIR echo "$BUILDDIR removed." - exit 1 fi if [ ! -f CMakeLists.txt ] diff --git a/src/sysinfo.h b/src/sysinfo.h index ae01447..c860cca 100644 --- a/src/sysinfo.h +++ b/src/sysinfo.h @@ -29,7 +29,7 @@ extern "C" { #endif #include "fbgui.h" -#include +//#include class SysInfo { public: @@ -44,7 +44,7 @@ private: const QString getUsbVendorIdProductIdSerialNumber(); // JSon testing - QJson::Serializer serializer; + //QJson::Serializer serializer; }; #endif // SYSTINFO_H -- cgit v1.2.3-55-g7522