diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user b/ServerLMS/ServerLMS/CMakeLists.txt.user index b499a77..61d6f81 100644 --- a/ServerLMS/ServerLMS/CMakeLists.txt.user +++ b/ServerLMS/ServerLMS/CMakeLists.txt.user @@ -1,10 +1,10 @@ - + EnvironmentId - {00ce76f6-77cf-4587-a216-9a8e243377cb} + {15ef2478-2444-4b00-88b8-fead51c6fef5} ProjectExplorer.Project.ActiveTarget @@ -67,7 +67,7 @@ Desktop Qt 5.14.2 MinGW 64-bit Desktop Qt 5.14.2 MinGW 64-bit qt.qt5.5142.win64_mingw73_kit - 0 + 4 0 0 @@ -75,11 +75,10 @@ CMAKE_BUILD_TYPE:STRING=Debug CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} - CMAKE_INSTALL_PREFIX:PATH=/MyServerLMS CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} - D:/LMS/BUILDS/ServerLMS/Debug64 + D:/QT/Projects/RRJServer/RRJServer/ServerLMS/build-ServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-Debug @@ -122,7 +121,7 @@ CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} - D:/VEYON/MyServer/Release64 + D:/QT/Projects/RRJServer/RRJServer/ServerLMS/build-ServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-Release @@ -165,7 +164,7 @@ CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} - D:/VEYON/MyServer/build-ServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-RelWithDebInfo + D:/QT/Projects/RRJServer/RRJServer/ServerLMS/build-ServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-RelWithDebInfo @@ -208,7 +207,7 @@ CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} - D:/VEYON/MyServer/build-ServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-MinSizeRel + D:/QT/Projects/RRJServer/RRJServer/ServerLMS/build-ServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-MinSizeRel @@ -243,7 +242,50 @@ Выпуск минимального размера CMakeProjectManager.CMakeBuildConfiguration - 4 + + + CMAKE_BUILD_TYPE:STRING=Debug + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + D:/QT/Projects/RRJServer/RRJServer/BUILDS/ServerLMS/Debug64 + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug2 + CMakeProjectManager.CMakeBuildConfiguration + + 5 0 diff --git a/ServerLMS/ServerLMS/serverlmswidget.cpp b/ServerLMS/ServerLMS/serverlmswidget.cpp index 66685e0..38c9f2f 100644 --- a/ServerLMS/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/ServerLMS/serverlmswidget.cpp @@ -79,6 +79,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) : first = true; qDebug() << "WidgetThread: " << QThread::currentThreadId(); + qDebug() << "SOME CHANGE"; } void ServerLMSWidget::autorizationHandler(QString login) diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt.user b/TestServerLMS/TestServerLMS/CMakeLists.txt.user index d2af602..ec9f1d2 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt.user +++ b/TestServerLMS/TestServerLMS/CMakeLists.txt.user @@ -1,10 +1,10 @@ - + EnvironmentId - {00ce76f6-77cf-4587-a216-9a8e243377cb} + {15ef2478-2444-4b00-88b8-fead51c6fef5} ProjectExplorer.Project.ActiveTarget @@ -67,7 +67,7 @@ Desktop Qt 5.14.2 MinGW 64-bit Desktop Qt 5.14.2 MinGW 64-bit qt.qt5.5142.win64_mingw73_kit - 0 + 4 0 0 @@ -78,7 +78,7 @@ CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} - D:/LMS/BUILDS/TestServerLMS/Debug64 + D:/QT/Projects/RRJServer/RRJServer/TestServerLMS/build-TestServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-Debug @@ -121,7 +121,7 @@ CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} - D:/LMS/TestServerLMS/Release64 + D:/QT/Projects/RRJServer/RRJServer/TestServerLMS/build-TestServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-Release @@ -164,7 +164,7 @@ CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} - D:/VEYON/MyServer/TestServerLMS/build-TestServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-RelWithDebInfo + D:/QT/Projects/RRJServer/RRJServer/TestServerLMS/build-TestServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-RelWithDebInfo @@ -207,7 +207,7 @@ CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} - D:/VEYON/MyServer/TestServerLMS/build-TestServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-MinSizeRel + D:/QT/Projects/RRJServer/RRJServer/TestServerLMS/build-TestServerLMS-Desktop_Qt_5_14_2_MinGW_64_bit-MinSizeRel @@ -242,7 +242,50 @@ Выпуск минимального размера CMakeProjectManager.CMakeBuildConfiguration - 4 + + + CMAKE_BUILD_TYPE:STRING=Debug + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + D:/QT/Projects/RRJServer/RRJServer/BUILDS/TestServerLMS/Debug64 + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug2 + CMakeProjectManager.CMakeBuildConfiguration + + 5 0 @@ -328,7 +371,7 @@ false true - D:/LMS/BUILDS/TestServerLMS/Debug64 + D:/QT/Projects/RRJServer/RRJServer/BUILDS/TestServerLMS/Debug64 1