diff options
| author | Jonathan Bauer | 2011-06-21 17:42:32 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2011-06-21 17:42:32 +0200 |
| commit | 9ce91f5128618b398e8b49849672e2833262cb5f (patch) | |
| tree | 42f54afe5b36362b0c1ed4994d99e020b5cb3953 | |
| parent | build-pkg.sh fixed bad paths (diff) | |
| download | fbgui-9ce91f5128618b398e8b49849672e2833262cb5f.tar.gz fbgui-9ce91f5128618b398e8b49849672e2833262cb5f.tar.xz fbgui-9ce91f5128618b398e8b49849672e2833262cb5f.zip | |
removed unneeded include
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | build.sh | 1 | ||||
| -rw-r--r-- | src/sysinfo.h | 4 |
4 files changed, 12 insertions, 3 deletions
@@ -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}) @@ -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 <qjson/serializer.h> +//#include <qjson/serializer.h> class SysInfo { public: @@ -44,7 +44,7 @@ private: const QString getUsbVendorIdProductIdSerialNumber(); // JSon testing - QJson::Serializer serializer; + //QJson::Serializer serializer; }; #endif // SYSTINFO_H |