Fully scope the qrc resource files

So they don't clash when KDDW is a static library
This commit is contained in:
Sergio Martins
2020-11-17 11:22:47 +00:00
parent 793c4e509b
commit 50d1e75709
9 changed files with 11 additions and 10 deletions

View File

@@ -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
```

View File

@@ -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");

View File

@@ -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"));

View File

@@ -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)

View File

@@ -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
}

View File

@@ -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)