diff --git a/README-WASM.md b/README-WASM.md index 8c5277e3..ca56971d 100644 --- a/README-WASM.md +++ b/README-WASM.md @@ -24,7 +24,7 @@ Builds tips for your own app: - As the build is static, don't forget to initialize KDDW's resources: ``` #ifdef QT_STATIC - Q_INIT_RESOURCE(resources); - Q_INIT_RESOURCE(multisplitter); + Q_INIT_RESOURCE(kddockwidgets_resources); + Q_INIT_RESOURCE(kddockwidgets_multisplitter); #endif ``` diff --git a/examples/dockwidgets/main.cpp b/examples/dockwidgets/main.cpp index 15f84fd9..cbfa6d8f 100644 --- a/examples/dockwidgets/main.cpp +++ b/examples/dockwidgets/main.cpp @@ -34,8 +34,8 @@ int main(int argc, char **argv) app.setApplicationName(QStringLiteral("Test app")); #ifdef QT_STATIC - Q_INIT_RESOURCE(resources); - Q_INIT_RESOURCE(multisplitter); + Q_INIT_RESOURCE(kddockwidgets_resources); + Q_INIT_RESOURCE(kddockwidgets_multisplitter); #endif QCommandLineParser parser; parser.setApplicationDescription("KDDockWidgets example application"); diff --git a/examples/minimal/main.cpp b/examples/minimal/main.cpp index 88628eb9..104a0e25 100644 --- a/examples/minimal/main.cpp +++ b/examples/minimal/main.cpp @@ -27,8 +27,8 @@ int main(int argc, char **argv) QApplication app(argc, argv); #ifdef QT_STATIC - Q_INIT_RESOURCE(resources); - Q_INIT_RESOURCE(multisplitter); + Q_INIT_RESOURCE(kddockwidgets_resources); + Q_INIT_RESOURCE(kddockwidgets_multisplitter); #endif app.setOrganizationName(QStringLiteral("KDAB")); diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4fd96b4e..a7fa8947 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,7 +96,7 @@ if(${PROJECT_NAME}_QTQUICK) private/quick/MainWindowWrapper.cpp ) - qt5_add_resources(RESOURCES_QUICK ${CMAKE_CURRENT_SOURCE_DIR}/qtquick.qrc) + qt5_add_resources(RESOURCES_QUICK ${CMAKE_CURRENT_SOURCE_DIR}/kddockwidgets_qtquick.qrc) else() set(DOCKSLIBS_SRCS ${DOCKSLIBS_SRCS} private/DebugWindow.cpp @@ -130,7 +130,7 @@ endif() add_subdirectory(private/multisplitter) -qt5_add_resources(RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/resources.qrc) +qt5_add_resources(RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/kddockwidgets_resources.qrc) add_library(kddockwidgets ${KDDockWidgets_LIBRARY_MODE} ${DOCKSLIBS_SRCS} ${DOCKS_INSTALLABLE_INCLUDES} ${RESOURCES} ${RESOURCES_QUICK}) add_library(KDAB::kddockwidgets ALIAS kddockwidgets) diff --git a/src/qtquick.qrc b/src/kddockwidgets_qtquick.qrc similarity index 100% rename from src/qtquick.qrc rename to src/kddockwidgets_qtquick.qrc diff --git a/src/resources.qrc b/src/kddockwidgets_resources.qrc similarity index 100% rename from src/resources.qrc rename to src/kddockwidgets_resources.qrc diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp index 46d637f2..104401b7 100644 --- a/src/private/DockRegistry.cpp +++ b/src/private/DockRegistry.cpp @@ -35,7 +35,8 @@ using namespace KDDockWidgets; static void initKDDockWidgetResources() { #ifdef KDDOCKWIDGETS_STATICLIB - Q_INIT_RESOURCE(resources); + Q_INIT_RESOURCE(kddockwidgets_resources); + Q_INIT_RESOURCE(kddockwidgets_multisplitter); #endif } diff --git a/src/private/multisplitter/CMakeLists.txt b/src/private/multisplitter/CMakeLists.txt index 5648d52c..c7bffa0c 100644 --- a/src/private/multisplitter/CMakeLists.txt +++ b/src/private/multisplitter/CMakeLists.txt @@ -56,7 +56,7 @@ if(BUILD_MULTISPLITTER_QTQUICK_FRONTEND) add_definitions(-DKDMULTISPLITTER_QTQUICK) endif() -qt5_add_resources(MULTISPLITTER_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/multisplitter.qrc) +qt5_add_resources(MULTISPLITTER_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/kddockwidgets_multisplitter.qrc) add_library(kddockwidgets_multisplitter ${KDDockWidgets_LIBRARY_MODE} ${MULTISPLITTER_SRCS} ${MULTISPLITTER_RESOURCES}) add_library(KDAB::kddockwidgets_multisplitter ALIAS kddockwidgets_multisplitter) diff --git a/src/private/multisplitter/multisplitter.qrc b/src/private/multisplitter/kddockwidgets_multisplitter.qrc similarity index 100% rename from src/private/multisplitter/multisplitter.qrc rename to src/private/multisplitter/kddockwidgets_multisplitter.qrc