commit 2dadfe4c526ad53c7ab46511f804ce804ca5bcf3 Author: androiddrew Date: Wed May 30 15:32:00 2018 -0400 Initial Commit diff --git a/cm-lib/client.cpp b/cm-lib/client.cpp new file mode 100644 index 0000000..5e8dcfb --- /dev/null +++ b/cm-lib/client.cpp @@ -0,0 +1,6 @@ +#include "client.h" + + +Client::Client() +{ +} diff --git a/cm-lib/client.h b/cm-lib/client.h new file mode 100644 index 0000000..f449bb8 --- /dev/null +++ b/cm-lib/client.h @@ -0,0 +1,13 @@ +#ifndef CLIENT_H +#define CLIENT_H + +#include "cm-lib_global.h" + +class CMLIBSHARED_EXPORT Client +{ + +public: + Client(); +}; + +#endif // CLIENT_H diff --git a/cm-lib/cm-lib.pro b/cm-lib/cm-lib.pro new file mode 100644 index 0000000..5391f57 --- /dev/null +++ b/cm-lib/cm-lib.pro @@ -0,0 +1,35 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2018-05-30T15:28:10 +# +#------------------------------------------------- + +QT -= gui + +TARGET = cm-lib +TEMPLATE = lib + +DEFINES += CMLIB_LIBRARY + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which has been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + client.cpp + +HEADERS += \ + client.h \ + cm-lib_global.h + +unix { + target.path = /usr/lib + INSTALLS += target +} diff --git a/cm-lib/cm-lib_global.h b/cm-lib/cm-lib_global.h new file mode 100644 index 0000000..899255c --- /dev/null +++ b/cm-lib/cm-lib_global.h @@ -0,0 +1,12 @@ +#ifndef CMLIB_GLOBAL_H +#define CMLIB_GLOBAL_H + +#include + +#if defined(CMLIB_LIBRARY) +# define CMLIBSHARED_EXPORT Q_DECL_EXPORT +#else +# define CMLIBSHARED_EXPORT Q_DECL_IMPORT +#endif + +#endif // CMLIB_GLOBAL_H diff --git a/cm-tests/client-tests.cpp b/cm-tests/client-tests.cpp new file mode 100644 index 0000000..70be2c0 --- /dev/null +++ b/cm-tests/client-tests.cpp @@ -0,0 +1,26 @@ +#include +#include + +class ClientTests : public QObject +{ + Q_OBJECT + +public: + ClientTests(); + +private Q_SLOTS: + void testCase1(); +}; + +ClientTests::ClientTests() +{ +} + +void ClientTests::testCase1() +{ + QVERIFY2(true, "Failure"); +} + +QTEST_APPLESS_MAIN(ClientTests) + +#include "client-tests.moc" diff --git a/cm-tests/cm-tests.pro b/cm-tests/cm-tests.pro new file mode 100644 index 0000000..c7a0b64 --- /dev/null +++ b/cm-tests/cm-tests.pro @@ -0,0 +1,30 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2018-05-30T15:30:33 +# +#------------------------------------------------- + +QT += testlib + +QT -= gui + +TARGET = client-tests +CONFIG += console +CONFIG -= app_bundle + +TEMPLATE = app + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which has been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + + +SOURCES += \ + client-tests.cpp \ No newline at end of file diff --git a/cm-ui/cm-ui.pro b/cm-ui/cm-ui.pro new file mode 100644 index 0000000..7777113 --- /dev/null +++ b/cm-ui/cm-ui.pro @@ -0,0 +1,29 @@ +QT += quick +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which as been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Additional import path used to resolve QML modules just for Qt Quick Designer +QML_DESIGNER_IMPORT_PATH = + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target diff --git a/cm-ui/main.cpp b/cm-ui/main.cpp new file mode 100644 index 0000000..6333b85 --- /dev/null +++ b/cm-ui/main.cpp @@ -0,0 +1,16 @@ +#include +#include + +int main(int argc, char *argv[]) +{ + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + + QGuiApplication app(argc, argv); + + QQmlApplicationEngine engine; + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + if (engine.rootObjects().isEmpty()) + return -1; + + return app.exec(); +} diff --git a/cm-ui/main.qml b/cm-ui/main.qml new file mode 100644 index 0000000..f3fae8f --- /dev/null +++ b/cm-ui/main.qml @@ -0,0 +1,9 @@ +import QtQuick 2.10 +import QtQuick.Window 2.10 + +Window { + visible: true + width: 640 + height: 480 + title: qsTr("Hello World") +} diff --git a/cm-ui/qml.qrc b/cm-ui/qml.qrc new file mode 100644 index 0000000..5f6483a --- /dev/null +++ b/cm-ui/qml.qrc @@ -0,0 +1,5 @@ + + + main.qml + + diff --git a/cm.pro b/cm.pro new file mode 100644 index 0000000..d5d407e --- /dev/null +++ b/cm.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs + +SUBDIRS += \ + cm-ui \ + cm-lib \ + cm-tests diff --git a/cm.pro.user b/cm.pro.user new file mode 100644 index 0000000..9c96106 --- /dev/null +++ b/cm.pro.user @@ -0,0 +1,559 @@ + + + + + + EnvironmentId + {41dc905e-8884-4a22-87d5-8abf3168d498} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.10.1 MSVC2017 64bit + Desktop Qt 5.10.1 MSVC2017 64bit + qt.qt5.5101.win64_msvc2017_64_kit + 0 + 0 + 0 + + C:/Users/Gideon/Documents/qt/build-cm-Desktop_Qt_5_10_1_MSVC2017_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/Gideon/Documents/qt/build-cm-Desktop_Qt_5_10_1_MSVC2017_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/Gideon/Documents/qt/build-cm-Desktop_Qt_5_10_1_MSVC2017_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + -1 + + + + + + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.10.1 MinGW 32bit + Desktop Qt 5.10.1 MinGW 32bit + qt.qt5.5101.win32_mingw53_kit + 0 + 0 + 0 + + C:/Users/Gideon/Documents/qt/build-cm-Desktop_Qt_5_10_1_MinGW_32bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/Gideon/Documents/qt/build-cm-Desktop_Qt_5_10_1_MinGW_32bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/Gideon/Documents/qt/build-cm-Desktop_Qt_5_10_1_MinGW_32bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + -1 + + + + + + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + +