diff options
| author | Niklas Goby | 2011-03-21 12:03:04 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-03-21 12:03:04 +0100 |
| commit | f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24 (patch) | |
| tree | 7234b2e8f2083fe23193bc1654c70ec395d20b12 /src/fbgui.pro | |
| parent | some changes in the fbgui, ipWatcher (diff) | |
| parent | and the files ^^ (diff) | |
| download | fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.tar.gz fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.tar.xz fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts:
src/fbgui.cpp
Diffstat (limited to 'src/fbgui.pro')
| -rw-r--r-- | src/fbgui.pro | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/fbgui.pro b/src/fbgui.pro index 1b8d1f8..353518b 100644 --- a/src/fbgui.pro +++ b/src/fbgui.pro @@ -2,23 +2,27 @@ TEMPLATE = app TARGET = fbgui CONFIG += qt \ debug -LIBS += -L/usr/local/qjson/lib \ - -lqjson -INCLUDEPATH += -I/usr/local/qjson/include QT += core \ gui \ - webkit \ - network -HEADERS += logViewer.h \ - downloadManager.h \ - fbgui.h \ - javascriptInterface.h \ - sysInfo.h -SOURCES += logViewer.cpp \ - downloadManager.cpp \ - main.cpp \ + network \ + webkit +LIBS += -L/usr/local/qjson/lib \ + -lqjson \ + -L/usr/local/Qxt/lib \ + -lQxtCore +INCLUDEPATH += /usr/local/qjson/include \ + /usr/local/Qxt/include \ + /usr/local/Qxt/include/QxtCore +HEADERS += sysinfo.h \ + loggerengine.h \ + javascriptinterface.h \ + downloadmanager.h \ + fbgui.h +SOURCES += sysinfo.cpp \ + loggerengine.cpp \ + javascriptinterface.cpp \ + downloadmanager.cpp \ fbgui.cpp \ - javascriptInterface.cpp \ - sysInfo.cpp + main.cpp FORMS += RESOURCES += fbgui.qrc |