From f5056a57473bd78e5e3136bf6d1f4c76da5d9d80 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 20 Aug 2022 13:16:49 +0300 Subject: [PATCH] fix build for qt6 --- .gitignore | 3 +++ CMakeLists.txt | 4 ++++ src/LibDeploy/src/configparser.cpp | 2 +- src/LibDeploy/src/distromodule.cpp | 6 +++--- src/LibDeploy/src/distromodule.h | 6 +++--- src/LibDeploy/src/extracter.cpp | 2 +- testcases/CMakeLists.txt | 19 ++++++++++++++++++ .../TestCPPOnly/CMakeLists.txt | 0 .../TestCPPOnly/main.cpp | 0 .../TestOnlyC/CMakeLists.txt | 0 testcases/TestOnlyC/main.cpp | 7 +++++++ .../TestQMLWidgets/CMakeLists.txt | 12 +++++++++-- .../TestQMLWidgets/HomeForm.ui.qml | 0 .../TestQMLWidgets/Page1Form.ui.qml | 0 .../TestQMLWidgets/Page2Form.ui.qml | 0 .../TestQMLWidgets/main.cpp | 0 .../TestQMLWidgets/main.qml | 0 .../TestQMLWidgets/qml.qrc | 0 .../TestQtWidgets/CMakeLists.txt | 0 .../TestQtWidgets/main.cpp | 0 .../TestQtWidgets/mainwindow.cpp | 0 .../TestQtWidgets/mainwindow.h | 0 .../TestQtWidgets/mainwindow.ui | 0 .../quicknanobrowser/ApplicationRoot.qml | 0 .../quicknanobrowser/BrowserDialog.qml | 0 .../quicknanobrowser/BrowserWindow.qml | 0 .../quicknanobrowser/CMakeLists.txt | 1 - .../quicknanobrowser/DownloadView.qml | 0 .../quicknanobrowser/FindBar.qml | 0 .../FullScreenNotification.qml | 0 .../doc/images/quicknanobrowser-demo.jpg | Bin .../doc/src/quicknanobrowser.qdoc | 0 .../quicknanobrowser/icons/3rdparty/COPYING | 0 .../icons/3rdparty/go-next.png | Bin .../icons/3rdparty/go-previous.png | Bin .../icons/3rdparty/process-stop.png | Bin .../icons/3rdparty/qt_attribution.json | 0 .../icons/3rdparty/view-refresh.png | Bin .../quicknanobrowser/main.cpp | 0 .../quicknanobrowser/resources.qrc | 0 .../quicknanobrowser/utils.h | 0 .../virtualkeyboard/CMakeLists.txt | 0 .../basic/.prev_CMakeLists.txt | 0 .../virtualkeyboard/basic/Basic.qml | 0 .../virtualkeyboard/basic/CMakeLists.txt | 0 .../virtualkeyboard/basic/basic-b2qt.qml | 0 .../virtualkeyboard/basic/basic.pro | 0 .../basic/content/AutoScroller.qml | 0 .../basic/content/FloatingButton_Active.svg | 0 .../content/FloatingButton_Available.svg | 0 .../content/FloatingButton_Unavailable.svg | 0 .../basic/content/HandwritingModeButton.qml | 0 .../basic/content/TextArea.qml | 0 .../basic/content/TextField.qml | 0 .../virtualkeyboard/basic/demo.qrc | 0 .../virtualkeyboard/basic/main.cpp | 0 .../virtualkeyboard/virtualkeyboard.pro | 0 .../webui/CMakeLists.txt | 0 .../examples => testcases}/webui/about.html | 0 .../webui/doc/images/webui-example.png | Bin .../webui/doc/src/webui.qdoc | 0 {tests/examples => testcases}/webui/main.cpp | 0 {tests/examples => testcases}/webui/webui.pro | 0 {tests/examples => testcases}/webui/webui.qrc | 0 .../webui/webuihandler.cpp | 0 .../webui/webuihandler.h | 0 tests/CMakeLists.txt | 9 +-------- tests/examples/TestOnlyC/main.cpp | 9 --------- tests/examples/TestQtWidgets/conf.qrc | 5 ----- tests/examples/TestQtWidgets/qt.conf | 2 -- 70 files changed, 52 insertions(+), 35 deletions(-) create mode 100644 testcases/CMakeLists.txt rename {tests/examples => testcases}/TestCPPOnly/CMakeLists.txt (100%) rename {tests/examples => testcases}/TestCPPOnly/main.cpp (100%) rename {tests/examples => testcases}/TestOnlyC/CMakeLists.txt (100%) create mode 100644 testcases/TestOnlyC/main.cpp rename {tests/examples => testcases}/TestQMLWidgets/CMakeLists.txt (76%) rename {tests/examples => testcases}/TestQMLWidgets/HomeForm.ui.qml (100%) rename {tests/examples => testcases}/TestQMLWidgets/Page1Form.ui.qml (100%) rename {tests/examples => testcases}/TestQMLWidgets/Page2Form.ui.qml (100%) rename {tests/examples => testcases}/TestQMLWidgets/main.cpp (100%) rename {tests/examples => testcases}/TestQMLWidgets/main.qml (100%) rename {tests/examples => testcases}/TestQMLWidgets/qml.qrc (100%) rename {tests/examples => testcases}/TestQtWidgets/CMakeLists.txt (100%) rename {tests/examples => testcases}/TestQtWidgets/main.cpp (100%) rename {tests/examples => testcases}/TestQtWidgets/mainwindow.cpp (100%) rename {tests/examples => testcases}/TestQtWidgets/mainwindow.h (100%) rename {tests/examples => testcases}/TestQtWidgets/mainwindow.ui (100%) rename {tests/examples => testcases}/quicknanobrowser/ApplicationRoot.qml (100%) rename {tests/examples => testcases}/quicknanobrowser/BrowserDialog.qml (100%) rename {tests/examples => testcases}/quicknanobrowser/BrowserWindow.qml (100%) rename {tests/examples => testcases}/quicknanobrowser/CMakeLists.txt (92%) rename {tests/examples => testcases}/quicknanobrowser/DownloadView.qml (100%) rename {tests/examples => testcases}/quicknanobrowser/FindBar.qml (100%) rename {tests/examples => testcases}/quicknanobrowser/FullScreenNotification.qml (100%) rename {tests/examples => testcases}/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg (100%) rename {tests/examples => testcases}/quicknanobrowser/doc/src/quicknanobrowser.qdoc (100%) rename {tests/examples => testcases}/quicknanobrowser/icons/3rdparty/COPYING (100%) rename {tests/examples => testcases}/quicknanobrowser/icons/3rdparty/go-next.png (100%) rename {tests/examples => testcases}/quicknanobrowser/icons/3rdparty/go-previous.png (100%) rename {tests/examples => testcases}/quicknanobrowser/icons/3rdparty/process-stop.png (100%) rename {tests/examples => testcases}/quicknanobrowser/icons/3rdparty/qt_attribution.json (100%) rename {tests/examples => testcases}/quicknanobrowser/icons/3rdparty/view-refresh.png (100%) rename {tests/examples => testcases}/quicknanobrowser/main.cpp (100%) rename {tests/examples => testcases}/quicknanobrowser/resources.qrc (100%) rename {tests/examples => testcases}/quicknanobrowser/utils.h (100%) rename {tests/examples => testcases}/virtualkeyboard/CMakeLists.txt (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/.prev_CMakeLists.txt (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/Basic.qml (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/CMakeLists.txt (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/basic-b2qt.qml (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/basic.pro (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/content/AutoScroller.qml (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/content/FloatingButton_Active.svg (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/content/FloatingButton_Available.svg (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/content/HandwritingModeButton.qml (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/content/TextArea.qml (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/content/TextField.qml (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/demo.qrc (100%) rename {tests/examples => testcases}/virtualkeyboard/basic/main.cpp (100%) rename {tests/examples => testcases}/virtualkeyboard/virtualkeyboard.pro (100%) rename {tests/examples => testcases}/webui/CMakeLists.txt (100%) rename {tests/examples => testcases}/webui/about.html (100%) rename {tests/examples => testcases}/webui/doc/images/webui-example.png (100%) rename {tests/examples => testcases}/webui/doc/src/webui.qdoc (100%) rename {tests/examples => testcases}/webui/main.cpp (100%) rename {tests/examples => testcases}/webui/webui.pro (100%) rename {tests/examples => testcases}/webui/webui.qrc (100%) rename {tests/examples => testcases}/webui/webuihandler.cpp (100%) rename {tests/examples => testcases}/webui/webuihandler.h (100%) delete mode 100644 tests/examples/TestOnlyC/main.cpp delete mode 100644 tests/examples/TestQtWidgets/conf.qrc delete mode 100644 tests/examples/TestQtWidgets/qt.conf diff --git a/.gitignore b/.gitignore index 868443d..8bbf0f6 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,6 @@ src/CQtDeployer/Deploy/QIFW/ src/CQtDeployer/Deploy/CQtDeployerSingle.json src/CQtDeployer/Deploy/QIFWTemplate/config/config.xml snap/snapcraft.yaml + +# binaries +testcases/bin/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 50a29ac..36a1059 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,10 @@ if (DEFINED CQT_DEPLOYER_TOOL) endif() if (CQT_DEPLOYER_TESTS) + + + add_subdirectory(testcases) + add_subdirectory(tests) else() message("The ${PROJECT_NAME} tests is disabled.") diff --git a/src/LibDeploy/src/configparser.cpp b/src/LibDeploy/src/configparser.cpp index 5eeda1a..f5a6427 100644 --- a/src/LibDeploy/src/configparser.cpp +++ b/src/LibDeploy/src/configparser.cpp @@ -546,7 +546,7 @@ bool ConfigParser::initDistroStruct() { return false; } - if (trData.size() && !parsePackagesPrivate(mainDistro, trData, &DistroModule::addTr)) { + if (trData.size() && !parsePackagesPrivate(mainDistro, trData, &DistroModule::addTranslation)) { packagesErrorLog("tr"); return false; } diff --git a/src/LibDeploy/src/distromodule.cpp b/src/LibDeploy/src/distromodule.cpp index a85573b..a34e106 100644 --- a/src/LibDeploy/src/distromodule.cpp +++ b/src/LibDeploy/src/distromodule.cpp @@ -175,15 +175,15 @@ void DistroModule::setInstallDirDEB(const QString &newInstallDir) { _installDirDEB = newInstallDir; } -QSet DistroModule::tr() const { +QSet DistroModule::translation() const { return _tr; } -void DistroModule::setTr(const QSet &tr) { +void DistroModule::setTranslation(const QSet &tr) { _tr = tr; } -void DistroModule::addTr(const QString &tr) { +void DistroModule::addTranslation(const QString &tr) { _tr += tr; } diff --git a/src/LibDeploy/src/distromodule.h b/src/LibDeploy/src/distromodule.h index 84aa6a6..9b8ebe0 100644 --- a/src/LibDeploy/src/distromodule.h +++ b/src/LibDeploy/src/distromodule.h @@ -70,9 +70,9 @@ public: void setExtraData(const QSet &extraFiles); void addExtraData(const QString &extraFile); - QSet tr() const; - void setTr(const QSet &tr); - void addTr(const QString &tr); + QSet translation() const; + void setTranslation(const QSet &tr); + void addTranslation(const QString &tr); QString installDirDEB() const; void setInstallDirDEB(const QString &newInstallDir); diff --git a/src/LibDeploy/src/extracter.cpp b/src/LibDeploy/src/extracter.cpp index 8e5cd34..19166a1 100644 --- a/src/LibDeploy/src/extracter.cpp +++ b/src/LibDeploy/src/extracter.cpp @@ -266,7 +266,7 @@ bool Extracter::copyTr() { QuasarAppUtils::Warning); } - const auto trFiles = i->tr(); + const auto trFiles = i->translation(); for (const auto &tr: trFiles) { QFileInfo info(tr); diff --git a/testcases/CMakeLists.txt b/testcases/CMakeLists.txt new file mode 100644 index 0000000..c18948b --- /dev/null +++ b/testcases/CMakeLists.txt @@ -0,0 +1,19 @@ +# +# Copyright (C) 2020-2022 QuasarApp. +# Distributed under the GPLv3 software license, see the accompanying +# Everyone is permitted to copy and distribute verbatim copies +# of this license document, but changing it is not allowed. +# + +cmake_minimum_required(VERSION 3.16) + +set(CMAKE_AUTOMOC ON) +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) + +add_subdirectory(quicknanobrowser) +add_subdirectory(TestCPPOnly) +add_subdirectory(TestOnlyC) +add_subdirectory(TestQMLWidgets) +add_subdirectory(TestQtWidgets) +add_subdirectory(virtualkeyboard) +add_subdirectory(webui) diff --git a/tests/examples/TestCPPOnly/CMakeLists.txt b/testcases/TestCPPOnly/CMakeLists.txt similarity index 100% rename from tests/examples/TestCPPOnly/CMakeLists.txt rename to testcases/TestCPPOnly/CMakeLists.txt diff --git a/tests/examples/TestCPPOnly/main.cpp b/testcases/TestCPPOnly/main.cpp similarity index 100% rename from tests/examples/TestCPPOnly/main.cpp rename to testcases/TestCPPOnly/main.cpp diff --git a/tests/examples/TestOnlyC/CMakeLists.txt b/testcases/TestOnlyC/CMakeLists.txt similarity index 100% rename from tests/examples/TestOnlyC/CMakeLists.txt rename to testcases/TestOnlyC/CMakeLists.txt diff --git a/testcases/TestOnlyC/main.cpp b/testcases/TestOnlyC/main.cpp new file mode 100644 index 0000000..768dc1e --- /dev/null +++ b/testcases/TestOnlyC/main.cpp @@ -0,0 +1,7 @@ +#include + +int main() +{ + printf("TEST DONE (ONLY_C)"); + return 0; +} diff --git a/tests/examples/TestQMLWidgets/CMakeLists.txt b/testcases/TestQMLWidgets/CMakeLists.txt similarity index 76% rename from tests/examples/TestQMLWidgets/CMakeLists.txt rename to testcases/TestQMLWidgets/CMakeLists.txt index 3bf50b9..80c2ef6 100644 --- a/tests/examples/TestQMLWidgets/CMakeLists.txt +++ b/testcases/TestQMLWidgets/CMakeLists.txt @@ -7,10 +7,12 @@ cmake_minimum_required(VERSION 3.18) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Quick) +set(CMAKE_AUTOMOC ON) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Qml Quick) set(CURRENT_PROJECT "TestQMLWidgets") + file(GLOB_RECURSE SOURCE_CPP "*.cpp" "*.h" ) @@ -24,5 +26,11 @@ set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") add_executable(${CURRENT_PROJECT} ${ALL_SOURCES} ) -target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Quick) +target_link_libraries(${CURRENT_PROJECT} PUBLIC + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR}) diff --git a/tests/examples/TestQMLWidgets/HomeForm.ui.qml b/testcases/TestQMLWidgets/HomeForm.ui.qml similarity index 100% rename from tests/examples/TestQMLWidgets/HomeForm.ui.qml rename to testcases/TestQMLWidgets/HomeForm.ui.qml diff --git a/tests/examples/TestQMLWidgets/Page1Form.ui.qml b/testcases/TestQMLWidgets/Page1Form.ui.qml similarity index 100% rename from tests/examples/TestQMLWidgets/Page1Form.ui.qml rename to testcases/TestQMLWidgets/Page1Form.ui.qml diff --git a/tests/examples/TestQMLWidgets/Page2Form.ui.qml b/testcases/TestQMLWidgets/Page2Form.ui.qml similarity index 100% rename from tests/examples/TestQMLWidgets/Page2Form.ui.qml rename to testcases/TestQMLWidgets/Page2Form.ui.qml diff --git a/tests/examples/TestQMLWidgets/main.cpp b/testcases/TestQMLWidgets/main.cpp similarity index 100% rename from tests/examples/TestQMLWidgets/main.cpp rename to testcases/TestQMLWidgets/main.cpp diff --git a/tests/examples/TestQMLWidgets/main.qml b/testcases/TestQMLWidgets/main.qml similarity index 100% rename from tests/examples/TestQMLWidgets/main.qml rename to testcases/TestQMLWidgets/main.qml diff --git a/tests/examples/TestQMLWidgets/qml.qrc b/testcases/TestQMLWidgets/qml.qrc similarity index 100% rename from tests/examples/TestQMLWidgets/qml.qrc rename to testcases/TestQMLWidgets/qml.qrc diff --git a/tests/examples/TestQtWidgets/CMakeLists.txt b/testcases/TestQtWidgets/CMakeLists.txt similarity index 100% rename from tests/examples/TestQtWidgets/CMakeLists.txt rename to testcases/TestQtWidgets/CMakeLists.txt diff --git a/tests/examples/TestQtWidgets/main.cpp b/testcases/TestQtWidgets/main.cpp similarity index 100% rename from tests/examples/TestQtWidgets/main.cpp rename to testcases/TestQtWidgets/main.cpp diff --git a/tests/examples/TestQtWidgets/mainwindow.cpp b/testcases/TestQtWidgets/mainwindow.cpp similarity index 100% rename from tests/examples/TestQtWidgets/mainwindow.cpp rename to testcases/TestQtWidgets/mainwindow.cpp diff --git a/tests/examples/TestQtWidgets/mainwindow.h b/testcases/TestQtWidgets/mainwindow.h similarity index 100% rename from tests/examples/TestQtWidgets/mainwindow.h rename to testcases/TestQtWidgets/mainwindow.h diff --git a/tests/examples/TestQtWidgets/mainwindow.ui b/testcases/TestQtWidgets/mainwindow.ui similarity index 100% rename from tests/examples/TestQtWidgets/mainwindow.ui rename to testcases/TestQtWidgets/mainwindow.ui diff --git a/tests/examples/quicknanobrowser/ApplicationRoot.qml b/testcases/quicknanobrowser/ApplicationRoot.qml similarity index 100% rename from tests/examples/quicknanobrowser/ApplicationRoot.qml rename to testcases/quicknanobrowser/ApplicationRoot.qml diff --git a/tests/examples/quicknanobrowser/BrowserDialog.qml b/testcases/quicknanobrowser/BrowserDialog.qml similarity index 100% rename from tests/examples/quicknanobrowser/BrowserDialog.qml rename to testcases/quicknanobrowser/BrowserDialog.qml diff --git a/tests/examples/quicknanobrowser/BrowserWindow.qml b/testcases/quicknanobrowser/BrowserWindow.qml similarity index 100% rename from tests/examples/quicknanobrowser/BrowserWindow.qml rename to testcases/quicknanobrowser/BrowserWindow.qml diff --git a/tests/examples/quicknanobrowser/CMakeLists.txt b/testcases/quicknanobrowser/CMakeLists.txt similarity index 92% rename from tests/examples/quicknanobrowser/CMakeLists.txt rename to testcases/quicknanobrowser/CMakeLists.txt index 023000a..aefcae8 100644 --- a/tests/examples/quicknanobrowser/CMakeLists.txt +++ b/testcases/quicknanobrowser/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.16) -project(quicknanobrowser LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/tests/examples/quicknanobrowser/DownloadView.qml b/testcases/quicknanobrowser/DownloadView.qml similarity index 100% rename from tests/examples/quicknanobrowser/DownloadView.qml rename to testcases/quicknanobrowser/DownloadView.qml diff --git a/tests/examples/quicknanobrowser/FindBar.qml b/testcases/quicknanobrowser/FindBar.qml similarity index 100% rename from tests/examples/quicknanobrowser/FindBar.qml rename to testcases/quicknanobrowser/FindBar.qml diff --git a/tests/examples/quicknanobrowser/FullScreenNotification.qml b/testcases/quicknanobrowser/FullScreenNotification.qml similarity index 100% rename from tests/examples/quicknanobrowser/FullScreenNotification.qml rename to testcases/quicknanobrowser/FullScreenNotification.qml diff --git a/tests/examples/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg b/testcases/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg similarity index 100% rename from tests/examples/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg rename to testcases/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg diff --git a/tests/examples/quicknanobrowser/doc/src/quicknanobrowser.qdoc b/testcases/quicknanobrowser/doc/src/quicknanobrowser.qdoc similarity index 100% rename from tests/examples/quicknanobrowser/doc/src/quicknanobrowser.qdoc rename to testcases/quicknanobrowser/doc/src/quicknanobrowser.qdoc diff --git a/tests/examples/quicknanobrowser/icons/3rdparty/COPYING b/testcases/quicknanobrowser/icons/3rdparty/COPYING similarity index 100% rename from tests/examples/quicknanobrowser/icons/3rdparty/COPYING rename to testcases/quicknanobrowser/icons/3rdparty/COPYING diff --git a/tests/examples/quicknanobrowser/icons/3rdparty/go-next.png b/testcases/quicknanobrowser/icons/3rdparty/go-next.png similarity index 100% rename from tests/examples/quicknanobrowser/icons/3rdparty/go-next.png rename to testcases/quicknanobrowser/icons/3rdparty/go-next.png diff --git a/tests/examples/quicknanobrowser/icons/3rdparty/go-previous.png b/testcases/quicknanobrowser/icons/3rdparty/go-previous.png similarity index 100% rename from tests/examples/quicknanobrowser/icons/3rdparty/go-previous.png rename to testcases/quicknanobrowser/icons/3rdparty/go-previous.png diff --git a/tests/examples/quicknanobrowser/icons/3rdparty/process-stop.png b/testcases/quicknanobrowser/icons/3rdparty/process-stop.png similarity index 100% rename from tests/examples/quicknanobrowser/icons/3rdparty/process-stop.png rename to testcases/quicknanobrowser/icons/3rdparty/process-stop.png diff --git a/tests/examples/quicknanobrowser/icons/3rdparty/qt_attribution.json b/testcases/quicknanobrowser/icons/3rdparty/qt_attribution.json similarity index 100% rename from tests/examples/quicknanobrowser/icons/3rdparty/qt_attribution.json rename to testcases/quicknanobrowser/icons/3rdparty/qt_attribution.json diff --git a/tests/examples/quicknanobrowser/icons/3rdparty/view-refresh.png b/testcases/quicknanobrowser/icons/3rdparty/view-refresh.png similarity index 100% rename from tests/examples/quicknanobrowser/icons/3rdparty/view-refresh.png rename to testcases/quicknanobrowser/icons/3rdparty/view-refresh.png diff --git a/tests/examples/quicknanobrowser/main.cpp b/testcases/quicknanobrowser/main.cpp similarity index 100% rename from tests/examples/quicknanobrowser/main.cpp rename to testcases/quicknanobrowser/main.cpp diff --git a/tests/examples/quicknanobrowser/resources.qrc b/testcases/quicknanobrowser/resources.qrc similarity index 100% rename from tests/examples/quicknanobrowser/resources.qrc rename to testcases/quicknanobrowser/resources.qrc diff --git a/tests/examples/quicknanobrowser/utils.h b/testcases/quicknanobrowser/utils.h similarity index 100% rename from tests/examples/quicknanobrowser/utils.h rename to testcases/quicknanobrowser/utils.h diff --git a/tests/examples/virtualkeyboard/CMakeLists.txt b/testcases/virtualkeyboard/CMakeLists.txt similarity index 100% rename from tests/examples/virtualkeyboard/CMakeLists.txt rename to testcases/virtualkeyboard/CMakeLists.txt diff --git a/tests/examples/virtualkeyboard/basic/.prev_CMakeLists.txt b/testcases/virtualkeyboard/basic/.prev_CMakeLists.txt similarity index 100% rename from tests/examples/virtualkeyboard/basic/.prev_CMakeLists.txt rename to testcases/virtualkeyboard/basic/.prev_CMakeLists.txt diff --git a/tests/examples/virtualkeyboard/basic/Basic.qml b/testcases/virtualkeyboard/basic/Basic.qml similarity index 100% rename from tests/examples/virtualkeyboard/basic/Basic.qml rename to testcases/virtualkeyboard/basic/Basic.qml diff --git a/tests/examples/virtualkeyboard/basic/CMakeLists.txt b/testcases/virtualkeyboard/basic/CMakeLists.txt similarity index 100% rename from tests/examples/virtualkeyboard/basic/CMakeLists.txt rename to testcases/virtualkeyboard/basic/CMakeLists.txt diff --git a/tests/examples/virtualkeyboard/basic/basic-b2qt.qml b/testcases/virtualkeyboard/basic/basic-b2qt.qml similarity index 100% rename from tests/examples/virtualkeyboard/basic/basic-b2qt.qml rename to testcases/virtualkeyboard/basic/basic-b2qt.qml diff --git a/tests/examples/virtualkeyboard/basic/basic.pro b/testcases/virtualkeyboard/basic/basic.pro similarity index 100% rename from tests/examples/virtualkeyboard/basic/basic.pro rename to testcases/virtualkeyboard/basic/basic.pro diff --git a/tests/examples/virtualkeyboard/basic/content/AutoScroller.qml b/testcases/virtualkeyboard/basic/content/AutoScroller.qml similarity index 100% rename from tests/examples/virtualkeyboard/basic/content/AutoScroller.qml rename to testcases/virtualkeyboard/basic/content/AutoScroller.qml diff --git a/tests/examples/virtualkeyboard/basic/content/FloatingButton_Active.svg b/testcases/virtualkeyboard/basic/content/FloatingButton_Active.svg similarity index 100% rename from tests/examples/virtualkeyboard/basic/content/FloatingButton_Active.svg rename to testcases/virtualkeyboard/basic/content/FloatingButton_Active.svg diff --git a/tests/examples/virtualkeyboard/basic/content/FloatingButton_Available.svg b/testcases/virtualkeyboard/basic/content/FloatingButton_Available.svg similarity index 100% rename from tests/examples/virtualkeyboard/basic/content/FloatingButton_Available.svg rename to testcases/virtualkeyboard/basic/content/FloatingButton_Available.svg diff --git a/tests/examples/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg b/testcases/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg similarity index 100% rename from tests/examples/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg rename to testcases/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg diff --git a/tests/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml b/testcases/virtualkeyboard/basic/content/HandwritingModeButton.qml similarity index 100% rename from tests/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml rename to testcases/virtualkeyboard/basic/content/HandwritingModeButton.qml diff --git a/tests/examples/virtualkeyboard/basic/content/TextArea.qml b/testcases/virtualkeyboard/basic/content/TextArea.qml similarity index 100% rename from tests/examples/virtualkeyboard/basic/content/TextArea.qml rename to testcases/virtualkeyboard/basic/content/TextArea.qml diff --git a/tests/examples/virtualkeyboard/basic/content/TextField.qml b/testcases/virtualkeyboard/basic/content/TextField.qml similarity index 100% rename from tests/examples/virtualkeyboard/basic/content/TextField.qml rename to testcases/virtualkeyboard/basic/content/TextField.qml diff --git a/tests/examples/virtualkeyboard/basic/demo.qrc b/testcases/virtualkeyboard/basic/demo.qrc similarity index 100% rename from tests/examples/virtualkeyboard/basic/demo.qrc rename to testcases/virtualkeyboard/basic/demo.qrc diff --git a/tests/examples/virtualkeyboard/basic/main.cpp b/testcases/virtualkeyboard/basic/main.cpp similarity index 100% rename from tests/examples/virtualkeyboard/basic/main.cpp rename to testcases/virtualkeyboard/basic/main.cpp diff --git a/tests/examples/virtualkeyboard/virtualkeyboard.pro b/testcases/virtualkeyboard/virtualkeyboard.pro similarity index 100% rename from tests/examples/virtualkeyboard/virtualkeyboard.pro rename to testcases/virtualkeyboard/virtualkeyboard.pro diff --git a/tests/examples/webui/CMakeLists.txt b/testcases/webui/CMakeLists.txt similarity index 100% rename from tests/examples/webui/CMakeLists.txt rename to testcases/webui/CMakeLists.txt diff --git a/tests/examples/webui/about.html b/testcases/webui/about.html similarity index 100% rename from tests/examples/webui/about.html rename to testcases/webui/about.html diff --git a/tests/examples/webui/doc/images/webui-example.png b/testcases/webui/doc/images/webui-example.png similarity index 100% rename from tests/examples/webui/doc/images/webui-example.png rename to testcases/webui/doc/images/webui-example.png diff --git a/tests/examples/webui/doc/src/webui.qdoc b/testcases/webui/doc/src/webui.qdoc similarity index 100% rename from tests/examples/webui/doc/src/webui.qdoc rename to testcases/webui/doc/src/webui.qdoc diff --git a/tests/examples/webui/main.cpp b/testcases/webui/main.cpp similarity index 100% rename from tests/examples/webui/main.cpp rename to testcases/webui/main.cpp diff --git a/tests/examples/webui/webui.pro b/testcases/webui/webui.pro similarity index 100% rename from tests/examples/webui/webui.pro rename to testcases/webui/webui.pro diff --git a/tests/examples/webui/webui.qrc b/testcases/webui/webui.qrc similarity index 100% rename from tests/examples/webui/webui.qrc rename to testcases/webui/webui.qrc diff --git a/tests/examples/webui/webuihandler.cpp b/testcases/webui/webuihandler.cpp similarity index 100% rename from tests/examples/webui/webuihandler.cpp rename to testcases/webui/webuihandler.cpp diff --git a/tests/examples/webui/webuihandler.h b/testcases/webui/webuihandler.h similarity index 100% rename from tests/examples/webui/webuihandler.h rename to testcases/webui/webuihandler.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a4aa1b2..b407760 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -21,7 +21,7 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/units") get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE) add_definitions(-DQT_BASE_DIR="${QT_QT_ROOT}") -add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}") +add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}/testcases/bin/") add_executable(${CURRENT_PROJECT} ${SOURCE_CPP}) target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test LibDeploy) @@ -32,10 +32,3 @@ target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR}) initTests() addTests(${PROJECT_NAME} ${CURRENT_PROJECT}) -add_subdirectory(examples/quicknanobrowser) -add_subdirectory(examples/TestCPPOnly) -add_subdirectory(examples/TestOnlyC) -add_subdirectory(examples/TestQMLWidgets) -add_subdirectory(examples/TestQtWidgets) -add_subdirectory(examples/virtualkeyboard) -add_subdirectory(examples/webui) diff --git a/tests/examples/TestOnlyC/main.cpp b/tests/examples/TestOnlyC/main.cpp deleted file mode 100644 index fd0821c..0000000 --- a/tests/examples/TestOnlyC/main.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include - -using namespace std; - -int main() -{ - cout << "TEST DONE (ONLY_C)" << endl; - return 0; -} diff --git a/tests/examples/TestQtWidgets/conf.qrc b/tests/examples/TestQtWidgets/conf.qrc deleted file mode 100644 index 03a1bfc..0000000 --- a/tests/examples/TestQtWidgets/conf.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - qt.conf - - diff --git a/tests/examples/TestQtWidgets/qt.conf b/tests/examples/TestQtWidgets/qt.conf deleted file mode 100644 index b19181a..0000000 --- a/tests/examples/TestQtWidgets/qt.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Paths] -Prefix = /some/path