summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Schmelzer2011-09-06 18:02:41 +0200
committerSebastian Schmelzer2011-09-06 18:02:41 +0200
commitb9dc90fcd2931b54aa889cdf9127dae28b9f463c (patch)
tree41e9ae57c710075518ded368405252c4a14f523f
parentadd version.h (diff)
downloadfbgui-b9dc90fcd2931b54aa889cdf9127dae28b9f463c.tar.gz
fbgui-b9dc90fcd2931b54aa889cdf9127dae28b9f463c.tar.xz
fbgui-b9dc90fcd2931b54aa889cdf9127dae28b9f463c.zip
transfer
-rw-r--r--LogReceiver/CMakeLists.txt13
-rw-r--r--LogReceiver/logreceiver.h7
2 files changed, 12 insertions, 8 deletions
diff --git a/LogReceiver/CMakeLists.txt b/LogReceiver/CMakeLists.txt
index 32f7b6e..137321a 100644
--- a/LogReceiver/CMakeLists.txt
+++ b/LogReceiver/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
project(LogReceiver)
-find_package(Qt4 REQUIRED)
+find_package(Qt4 REQUIRED 4.7)
if (QT4_FOUND)
message(STATUS "QT4 found.")
else(QT4_FOUND)
@@ -11,8 +11,8 @@ endif(QT4_FOUND)
#find_package(Qxt REQUIRED)
-#set(QT_USE_CORE TRUE)
-#set(QT_USE_GUI TRUE)
+set(QT_USE_QTCORE TRUE)
+set(QT_USE_QTGUI TRUE)
set(QT_USE_QTNETWORK TRUE)
set(QT_USE_QTWEBKIT TRUE)
@@ -23,8 +23,10 @@ file(GLOB_RECURSE LOGRECEIVER_RCS ./*.qrc)
include_directories(${CMAKE_CURRENT_BINARY_DIR}
/usr/include/
- /home/niklas/fbgui/customdhcpcd/src/
- /home/niklas/fbgui/LogReceiver/build)
+ ../customdhcpcd/src/
+ ./build
+ ${QT_INCLUDE_DIR}
+ )
include(${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS})
@@ -44,6 +46,7 @@ QT4_WRAP_UI(LOGRECEIVER_UI_HEADERS ${LOGRECEIVER_UIS})
add_executable(LogReceiver
+ ${QT_INCLUDES}
${LOGRECEIVER_SOURCES}
${LOGRECEIVER_MOC_SOURCES}
${LOGRECEIVER_UI_HEADERS})
diff --git a/LogReceiver/logreceiver.h b/LogReceiver/logreceiver.h
index b11fd0c..f22e619 100644
--- a/LogReceiver/logreceiver.h
+++ b/LogReceiver/logreceiver.h
@@ -1,9 +1,10 @@
#ifndef LOGRECEIVER_H
#define LOGRECEIVER_H
-#include <QMap>
+//#include <QMap>
#include <QtNetwork>
-#include <QProcess>
+#include <QtCore>
+//#include <QProcess>
#include <arpa/inet.h>
#include <stdio.h>
@@ -24,7 +25,7 @@
//#include <QLocalServer>
//#include <QTcpSocket>
//#include <QSsl>
-//#include <QNetworkConfigurationManager>
+#include <QNetworkConfigurationManager>
//#include <QNetworkAccessManager>
#include <QWidget>