Commit 2144d981 authored by Linus Jahn's avatar Linus Jahn Committed by GitHub

Restructure project (#22)

I also had to adjust the README and of course the qrc-file.
In the qrc-file I adjusted the path and added an alias, so
all code remains compatible (we should add such aliases for
all files in there).

Closes #10.
parent 627b0301
################### Kaidan ####################
app/kaidan
bin/kaidan
###################### C++ ####################
# Prerequisites
......
......@@ -35,7 +35,7 @@ Either
or use command line
* `cd Kaidan/app`
* `cd Kaidan`
* `qmake`
* `make -j<Number of threads>`
......
<RCC>
<qresource prefix="/">
<file>main.qml</file>
<file>RosterPage.qml</file>
<file>LoginPage.qml</file>
</qresource>
</RCC>
# path to local compiled swift 3 lib
SWIFT3PATH = ../../swift-3.0
SWIFT3PATH = ../swift-3.0
# from swift-config
SWIFTCXX = -DSWIFTEN_STATIC -DBOOST_ALL_NO_LIB -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_SIGNALS_NO_DEPRECATION_WARNING -DSWIFT_EXPERIMENTAL_FT
SWIFTLIB = -lSwiften -lSwiften_Boost -lrt -lz -lssl -lcrypto -lxml2 -lresolv -lpthread -ldl -lm -lc -lstdc++
......@@ -8,6 +8,8 @@ SWIFTLIB = -lSwiften -lSwiften_Boost -lrt -lz -lssl -lcrypto -lxml2 -lresolv -lp
TEMPLATE = app
QT += qml quick core
TARGET = bin/kaidan
INCLUDEPATH += $${SWIFT3PATH}/3rdParty/Boost/src
INCLUDEPATH += $${SWIFT3PATH}/
......@@ -16,22 +18,23 @@ LIBS += -L$${SWIFT3PATH}/Swiften -L$${SWIFT3PATH}/3rdParty/Boost $${SWIFTLIB}
DEFINES += BOOST_SIGNALS_NO_DEPRECATION_WARNING
SOURCES += source/main.cpp \
source/Kaidan.cpp \
source/RosterContoller.cpp \
source/RosterItem.cpp
SOURCES += src/main.cpp \
src/Kaidan.cpp \
src/RosterContoller.cpp \
src/RosterItem.cpp
HEADERS += source/Kaidan.h \
source/EchoPayload.h \
source/EchoPayloadParserFactory.h \
source/EchoPayloadSerializer.h \
source/RosterContoller.h \
source/RosterItem.h
HEADERS += src/Kaidan.h \
src/EchoPayload.h \
src/EchoPayloadParserFactory.h \
src/EchoPayloadSerializer.h \
src/RosterContoller.h \
src/RosterItem.h
RESOURCES += resources/qml.qrc
RESOURCES += kaidan.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH =
# Default rules for deployment.
include(resources/deployment.pri)
include(kaidan.pri)
<RCC>
<qresource prefix="/">
<file alias="main.qml">src/qml/main.qml</file>
<file alias="RosterPage.qml">src/qml/RosterPage.qml</file>
<file alias="LoginPage.qml">src/qml/LoginPage.qml</file>
</qresource>
</RCC>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment