Changes to integrate a new qml gui target

This commit is contained in:
Felix Hammer
2015-01-06 00:48:19 +01:00
parent 6a8c159450
commit 507fbae5aa
7 changed files with 52 additions and 17 deletions
+21
View File
@@ -28,6 +28,23 @@
* shall include the source code for the parts of OpenSSL used as well *
* as that of the covered work. *
*****************************************************************************/
#ifdef QML_CLIENT
//START THE QML SWITCH HERE
#include <QApplication>
#include "qmlwrapper.h"
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
qmlWrapper *myQml = new qmlWrapper();
return app.exec();
}
#else
// START OF OLD QT-WIDGETS GUI SECTION
#include <boost/asio.hpp>
#include <iostream>
#include <cstdlib>
@@ -285,3 +302,7 @@ int main( int argc, char **argv )
socket_cleanup();
return retVal;
}
// END OF OLD QT-WIDGETS GUI SECTION
#endif