qmake moved all feature to private/ folder

Moved all features which aren't used through CONFIG+=xyz and are loaded
using the load(private/xyz) function to the qmake/features/private/
folder.

Currently, the qmake/features/ folder contains only features which
should be used using the CONFIG+= qmake variable.

TinyORM.pro

@@ -14,14 +14,14 @@ tinyMinRecGCC     = 10.2
 tinyMinRecQt      = 5.15.2
 
 # Check/verify all toolchain requirements and edge cases, throws error() on any problem
-load(tiny_toolchain_requirement)
+load(private/tiny_toolchain_requirement)
 # The staticlib option check
-load(tiny_staticlib_check)
+load(private/tiny_staticlib_check)
 
 # Sub-projects
 # ---
 
-load(tiny_drivers)
+load(private/tiny_drivers)
 tiny_drivers_check_build_types()
 
 SUBDIRS =

conf.pri.example

@@ -94,8 +94,8 @@
 # Ubuntu - apt install ccache
 
 disable_autoconf {
-#    load(tiny_system_includepath)
-    load(tiny_find_packages)
+#    load(private/tiny_system_includepath)
+    load(private/tiny_find_packages)
 }
 
 # MinGW

docs/building/tinyorm.mdx

@@ -989,7 +989,7 @@ You can also use TinyORM's `qmake` function `tiny_add_system_includepath()` whic
 ```qmake
 # vcpkg - range-v3 and tabulate
 # ---
-load(tiny_system_includepath)
+load(private/tiny_system_includepath)
 tiny_add_system_includepath(<your_path>/vcpkg/installed/x64-linux/include/)
 ```
 

drivers/common/common.pro

@@ -51,7 +51,7 @@ CONFIG(release, debug|release): DEFINES += TINYDRIVERS_NO_DEBUG
 # Debug build
 CONFIG(debug, debug|release): DEFINES *= TINYDRIVERS_DEBUG
 
-load(tiny_drivers)
+load(private/tiny_drivers)
 # Cache the result to the isBuildingMySqlDriver variable
 tiny_is_building_driver(mysql, isBuildingMySqlDriver)
 
@@ -89,7 +89,7 @@ $$isBuildingMySqlDriver {
 
 # Find version numbers in the version header file and assign them to the
 # <TARGET>_VERSION_<MAJOR,MINOR,PATCH,TWEAK> and also to the VERSION variable.
-load(tiny_version_numbers)
+load(private/tiny_version_numbers)
 tiny_version_numbers()
 
 # Windows resource and manifest files
@@ -101,7 +101,7 @@ tinyRcIncludepath = $$quote($$TINYORM_SOURCE_TREE/include/) \
 # To find Windows manifest
 mingw: tinyRcIncludepath += $$quote($$TINYORM_SOURCE_TREE/drivers/common/resources/)
 
-load(tiny_resource_and_manifest)
+load(private/tiny_resource_and_manifest)
 tiny_resource_and_manifest(                                                             \
     $$tinyRcIncludepath, $$quote($$TINYORM_SOURCE_TREE/drivers/common/resources)        \
 )
@@ -131,7 +131,7 @@ win32-msvc:CONFIG(debug, debug|release) {
 # To include commonnamespace.hpp, export_common.hpp, likely.hpp, and systemheader.hpp
 # Helps to avoid dependency on the TinyCommon (no need because of 4 simple files)
 
-load(tiny_system_includepath)
+load(private/tiny_system_includepath)
 tiny_add_system_includepath($$quote($$TINYORM_SOURCE_TREE/include/))
 
 # This path is already added on the INCLUDEPATH in the mysql/include/include.pri file
@@ -145,7 +145,7 @@ $$isBuildingMySqlDriver: \
 
 !build_loadable_drivers: \
 !disable_autoconf {
-    load(tiny_find_packages)
+    load(private/tiny_find_packages)
 
     # Find the MySQL and add it on the system include path and library path
     $$isBuildingMySqlDriver: \

drivers/conf.pri.example

@@ -2,8 +2,8 @@
 # ---
 
 disable_autoconf {
-#    load(tiny_system_includepath)
-    load(tiny_find_packages)
+#    load(private/tiny_system_includepath)
+    load(private/tiny_find_packages)
 }
 
 # MinGW

drivers/drivers.pro

@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-load(tiny_drivers)
+load(private/tiny_drivers)
 
 SUBDIRS = common
 

drivers/mysql/mysql.pro

@@ -52,7 +52,7 @@ CONFIG(release, debug|release): DEFINES += TINYDRIVERS_NO_DEBUG
 CONFIG(debug, debug|release): DEFINES *= TINYDRIVERS_DEBUG
 
 # Used by exceptions (public C macro, used in Drivers::Exceptions::SqlError/QueryError)
-load(tiny_drivers)
+load(private/tiny_drivers)
 tiny_is_building_driver(mysql): \
     DEFINES *= TINYDRIVERS_MYSQL_DRIVER
 
@@ -80,7 +80,7 @@ include($$PWD/src/src.pri)
 
 # Find version numbers in the version header file and assign them to the
 # <TARGET>_VERSION_<MAJOR,MINOR,PATCH,TWEAK> and also to the VERSION variable.
-load(tiny_version_numbers)
+load(private/tiny_version_numbers)
 tiny_version_numbers()
 
 # Windows resource and manifest files
@@ -92,7 +92,7 @@ tinyRcIncludepath = $$quote($$TINYORM_SOURCE_TREE/include/) \
 # To find Windows manifest
 mingw: tinyRcIncludepath += $$quote($$TINYORM_SOURCE_TREE/drivers/mysql/resources/)
 
-load(tiny_resource_and_manifest)
+load(private/tiny_resource_and_manifest)
 tiny_resource_and_manifest(                                                            \
     $$tinyRcIncludepath, $$quote($$TINYORM_SOURCE_TREE/drivers/mysql/resources)        \
 )
@@ -122,7 +122,7 @@ win32-msvc:CONFIG(debug, debug|release) {
 # To include commonnamespace.hpp, likely.hpp, and systemheader.hpp
 # Helps to avoid dependency on the TinyCommon (no need because of 3 simple files)
 
-load(tiny_system_includepath)
+load(private/tiny_system_includepath)
 tiny_add_system_includepath(                                              \
     $$quote($$TINYORM_SOURCE_TREE/include/)                               \
     $$quote($$TINYORM_SOURCE_TREE/drivers/common/include/)                \
@@ -136,7 +136,7 @@ LIBS += -lTinyDrivers
 # ---
 
 !disable_autoconf {
-    load(tiny_find_packages)
+    load(private/tiny_find_packages)
 
     # Find the MySQL and add it on the system include path and library path
     tiny_find_mysql()

examples/tom/conf.pri.example

@@ -15,8 +15,8 @@ include($$TINYORM_SOURCE_TREE/tests/database/seeders.pri)
 # ---
 
 disable_autoconf {
-#    load(tiny_system_includepath)
-    load(tiny_find_packages)
+#    load(private/tiny_system_includepath)
+    load(private/tiny_find_packages)
 }
 
 # MinGW

include/include.pri

@@ -12,7 +12,7 @@ else: \
         $$PWD/orm/schema/schemaconstants_inline.hpp
 
 # TinyOrm library compiled against the TinyDrivers doesn't use these exception classes
-load(tiny_drivers)
+load(private/tiny_drivers)
 !tiny_is_building_drivers(): \
     headersList += \
         $$PWD/orm/exceptions/queryerror.hpp \

qmake/TinyOrm.pri

@@ -85,7 +85,7 @@ disable_tom: DEFINES *= TINYORM_DISABLE_TOM
 # Link against TinyORM library
 # ---
 
-load(tiny_system_includepath)
+load(private/tiny_system_includepath)
 
 tiny_add_system_includepath($$quote($$TINYORM_SOURCE_TREE/include/))
 
@@ -106,7 +106,7 @@ tiny_add_system_includepath($$quote($$TINYORM_SOURCE_TREE/include/))
 # TINY_VCPKG_ROOT and TINY_VCPKG_TRIPLET environment variables
 # VCPKG_ROOT and VCPKG_DEFAULT_TRIPLET environment variables
 
-load(tiny_find_packages)
+load(private/tiny_find_packages)
 
 tiny_find_vcpkg()
 

qmake/common/TinyOrm.pri

@@ -43,5 +43,5 @@ build_tests: \
 # Link against the TinyDrivers library (if enabled) or QtSql module
 # ---
 
-load(tiny_drivers)
+load(private/tiny_drivers)
 tiny_link_drivers()

qmake/common/common.pri

@@ -1,7 +1,7 @@
 # Load .env and .env.$$QMAKE_PLATFORM files
 # ---
 
-load(tiny_dotenv)
+load(private/tiny_dotenv)
 
 # Common Configuration ( also for tests )
 # ---

qmake/features/disable_orm.prf

@@ -1,4 +1,4 @@
-load(tiny_drivers)
+load(private/tiny_drivers)
 
 # Nothing to do, TinyDrivers doesn't use this CONFIG option
 tiny_is_drivers_target(): \

qmake/features/disable_tom.prf

@@ -1,4 +1,4 @@
-load(tiny_drivers)
+load(private/tiny_drivers)
 
 # Nothing to do, TinyDrivers doesn't use this CONFIG option
 tiny_is_drivers_target(): \

qmake/features/private/tiny_drivers.prf

@@ -180,7 +180,7 @@ defineTest(tiny_add_drivers_includepath) {
     }
     # Add as the SYSTEM include path
     else {
-        load(tiny_system_includepath)
+        load(private/tiny_system_includepath)
         tiny_add_system_includepath($$driversIncludePath)
     }
 }

qmake/features/private/tiny_find_packages.prf

@@ -1,5 +1,5 @@
-load(tiny_system_includepath)
-load(tiny_vcpkg)
+load(private/tiny_system_includepath)
+load(private/tiny_vcpkg)
 
 # Find the vcpkg root folder and add the vcpkg/<triplet>/include/ on system include path.
 defineTest(tiny_find_vcpkg) {

qmake/features/private/tiny_toolchain_requirement.prf

@@ -1,7 +1,7 @@
 # Check/verify all toolchain requirements and edge cases, throws error() on any problem
 
 # Populate the TINY_COMPILER_VERSION and TINY_SIMULATED_VERSION qmake variables
-load(tiny_compiler_version)
+load(private/tiny_compiler_version)
 
 !build_pass: \
 if(win32-msvc|win32-clang-msvc) {

qmake/features/tom_example.prf

@@ -1,4 +1,4 @@
-load(tiny_drivers)
+load(private/tiny_drivers)
 
 # Nothing to do, TinyDrivers doesn't use this CONFIG option
 tiny_is_drivers_target(): \

qmake/tom.pri

@@ -89,7 +89,7 @@ disable_tom: \
 
 # Find version numbers in the version header file and assign them to the
 # <TARGET>_VERSION_<MAJOR,MINOR,PATCH,TWEAK> and also to the VERSION variable.
-load(tiny_version_numbers)
+load(private/tiny_version_numbers)
 tiny_version_numbers($$quote($$TINYTOM_SOURCE_TREE/include/tom/version.hpp))
 
 # Windows resource and manifest files
@@ -101,7 +101,7 @@ tinyRcIncludepath = $$quote($$TINYORM_SOURCE_TREE/include/) \
 # To find Windows manifest
 mingw: tinyRcIncludepath += $$quote($$TINYTOM_SOURCE_TREE/resources/)
 
-load(tiny_resource_and_manifest)
+load(private/tiny_resource_and_manifest)
 tiny_resource_and_manifest(                                               \
     $$tinyRcIncludepath, $$TINYTOM_SOURCE_TREE/resources, tom, Tom        \
 )
@@ -111,7 +111,7 @@ unset(tinyRcIncludepath)
 # Link against TinyORM library
 # ---
 
-load(tiny_system_includepath)
+load(private/tiny_system_includepath)
 
 tiny_add_system_includepath(                   \
     $$quote($$TINYORM_SOURCE_TREE/include/)    \
@@ -132,7 +132,7 @@ tiny_add_system_includepath(                   \
 # TINY_VCPKG_ROOT and TINY_VCPKG_TRIPLET environment variables
 # VCPKG_ROOT and VCPKG_DEFAULT_TRIPLET environment variables
 
-load(tiny_find_packages)
+load(private/tiny_find_packages)
 
 tiny_find_vcpkg()
 

src/src.pri

@@ -6,7 +6,7 @@ extern_constants: \
         $$PWD/orm/schema/schemaconstants_extern.cpp
 
 # TinyOrm library compiled against the TinyDrivers doesn't use these exception classes
-load(tiny_drivers)
+load(private/tiny_drivers)
 !tiny_is_building_drivers(): \
     sourcesList += \
         $$PWD/orm/exceptions/queryerror.cpp \

src/src.pro

@@ -44,13 +44,13 @@ include($$PWD/src.pri)
 
 # Find version numbers in the version header file and assign them to the
 # <TARGET>_VERSION_<MAJOR,MINOR,PATCH,TWEAK> and also to the VERSION variable.
-load(tiny_version_numbers)
+load(private/tiny_version_numbers)
 tiny_version_numbers()
 
 # Windows resource and manifest files
 # ---
 
-load(tiny_resource_and_manifest)
+load(private/tiny_resource_and_manifest)
 tiny_resource_and_manifest(                                                            \
     # RC_INCLUDEPATH - find icons, Windows manifest on MinGW, and orm/version.hpp and stringify.hpp
     # These two paths are not divided as in other tiny_resource_and_manifest() calls
@@ -76,7 +76,7 @@ win32-msvc:CONFIG(debug, debug|release) {
 # Some info output
 # ---
 
-load(tiny_info_messages)
+load(private/tiny_info_messages)
 tiny_log_info_messages()
 
 !build_pass {
@@ -93,7 +93,7 @@ tiny_log_info_messages()
 # ---
 
 !disable_autoconf {
-    load(tiny_find_packages)
+    load(private/tiny_find_packages)
 
     # Find the vcpkg and add the vcpkg/<triplet>/include/ on the system include path
     tiny_find_vcpkg()

tests/TinyUtils/TinyUtils.pro

@@ -34,7 +34,7 @@ include($$PWD/src/src.pri)
 
 # Find version numbers in a version header file and assign them to the
 # <TARGET>_VERSION_<MAJOR,MINOR,PATCH,TWEAK> and also to the VERSION variable
-load(tiny_version_numbers)
+load(private/tiny_version_numbers)
 tiny_version_numbers()
 
 # Windows resource and manifest files
@@ -46,7 +46,7 @@ tinyRcIncludepath = $$quote($$TINYORM_SOURCE_TREE/include/) \
 # Find Windows manifest
 mingw: tinyRcIncludepath += $$quote($$TINYORM_SOURCE_TREE/tests/TinyUtils/resources/)
 
-load(tiny_resource_and_manifest)
+load(private/tiny_resource_and_manifest)
 tiny_resource_and_manifest($$tinyRcIncludepath)
 
 unset(tinyRcIncludepath)

tests/auto/functional/functional.pro

@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-load(tiny_drivers)
+load(private/tiny_drivers)
 
 subdirsList = \
     orm \

tests/auto/functional/others/versions/versions.pro

@@ -22,7 +22,7 @@ win32 {
 
     # Find version numbers in the version header files and assign them to the
     # <TARGET>_VERSION_<MAJOR,MINOR,PATCH,TWEAK> (excluding the VERSION variable).
-    load(tiny_version_numbers)
+    load(private/tiny_version_numbers)
     build_shared_drivers | \
     build_loadable_drivers: tiny_version_numbers(, TinyDrivers, false)
     build_loadable_drivers: tiny_version_numbers(, TinyMySql, false)

tests/conf.pri.example

@@ -2,8 +2,8 @@
 # ---
 
 disable_autoconf {
-#    load(tiny_system_includepath)
-    load(tiny_find_packages)
+#    load(private/tiny_system_includepath)
+    load(private/tiny_find_packages)
 }
 
 # MinGW

tests/qmake/common.pri

@@ -43,7 +43,7 @@ DEFINES *= PROJECT_TINYORM_TEST
 mingw: tinyRcIncludepath += $$quote($$TINYORM_SOURCE_TREE/tests/resources/)
 else:  tinyRcIncludepath =
 
-load(tiny_resource_and_manifest)
+load(private/tiny_resource_and_manifest)
 tiny_resource_and_manifest($$tinyRcIncludepath,     \
     $$quote($$TINYORM_SOURCE_TREE/tests/resources), \
     TinyTest                                        \

tests/testdata_tom/conf.pri.example

@@ -2,8 +2,8 @@
 # ---
 
 disable_autoconf {
-#    load(tiny_system_includepath)
-    load(tiny_find_packages)
+#    load(private/tiny_system_includepath)
+    load(private/tiny_find_packages)
 }
 
 # MinGW