QT/TaoQuick
1
0
Fork 0
mirror of https://github.com/jaredtao/TaoQuick.git synced 2025-01-17 20:12:54 +08:00
Code Issues Projects Releases Wiki Activity

update ImportPath

Browse Source
This commit is contained in:
jared 2023-05-11 23:55:04 +08:00
parent 0b28f66691
commit a258edde9d
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/TaoQuickShow/CMakeLists.txt
View File

@ -26,7 +26,8 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/TaoCommon/src/TaoCommon ${CMAKE_SO
include(taoQuick)
include(${PROJECT_SOURCE_DIR}/src/taoQuick.cmake)
message("TaoQuickRes ${TaoQuickRes}")
set (Res Qml.qrc Contents.qrc Image.qrc)
if (CMAKE_BUILD_TYPE MATCHES "Release")

8
examples/TaoQuickShow/Src/main.cpp
View File

@ -53,10 +53,10 @@ int main(int argc, char** argv)
appInfo.beforeUiReady(view.rootContext());
view.engine()->addImportPath(qmlPath);
#ifdef TaoQuickImport
view.engine()->addImportPath(TaoQuickImport);
view.rootContext()->setContextProperty("taoQuickImportPath", TaoQuickImport);
qWarning() << "TaoQuickImportPath " << TaoQuickImport;
#ifdef TaoQuickImportPath
view.engine()->addImportPath(TaoQuickImportPath);
view.rootContext()->setContextProperty("taoQuickImportPath", TaoQuickImportPath);
qWarning() << "TaoQuickImportPath " << TaoQuickImportPath;
#endif
#ifdef TAODEBUG

2
examples/TaoQuickShow/TaoQuickShow.pro
View File

@ -33,7 +33,7 @@ DEFINES += QMAKE_GEN_TAOMACRO
!build_pass {
headerContents = \
"$${LITERAL_HASH}pragma once" \
"$${LITERAL_HASH}define TaoQuickImport $${TaoQuickImport}" \
"$${LITERAL_HASH}define TaoQuickImportPath $${TaoQuickImportPath}" \
"$${LITERAL_HASH}define qmlPath $${qmlPath}" \
"$${LITERAL_HASH}define contentsPath $${contentsPath}" \
"$${LITERAL_HASH}define imgPath $${imgPath}" \

4
src/TaoQuick.pri
View File

@ -6,8 +6,6 @@ CONFIG(debug,debug|release){
} else {
path=$$system("pwd")
}
TaoQuickImport=\"file:///$$path/\"
TaoQuickImage=\"file:///$$path/TaoQuick/Images/\"
DEFINES += TaoQuickImportPath=\\\"file:///$${path}/\\\"
OTHER_FILES += $$files($$path/TaoQuick/Qml/*.qml, true)
@ -16,8 +14,6 @@ CONFIG(debug,debug|release){
# release mode use qrc file
RESOURCES += $$PWD/TaoQuick/TaoQuick.qrc
# release mode set importPath with 'qrc:///'
TaoQuickImport=\"qrc:/\"
TaoQuickImage=\"qrc:/TaoQuick/Images/\"
DEFINES += TaoQuickImportPath=\\\"qrc:///\\\"
}

11
cmake/taoQuick.cmake → src/taoQuick.cmake
View File

@ -1,16 +1,13 @@
set(TaoQuickPath ${CMAKE_SOURCE_DIR}/src)
set(TaoQuickPath ${CMAKE_CURRENT_LIST_DIR})
if (CMAKE_BUILD_TYPE MATCHES "Release")
set(TaoQuickRes ${TaoQuickPath}/TaoQuick/TaoQuick.qrc CACHE STRING "tao quick res path")
set(TaoQuickImport "qrc:///" CACHE STRING "tao quick import path")
set(TaoQuickImportPath "qrc:///" CACHE STRING "tao quick import path")
else()
set(TaoQuickImport "file:///${TaoQuickPath}/" CACHE STRING "tao quick import path")
set(TaoQuickImportPath "file:///${TaoQuickPath}/" CACHE STRING "tao quick import path")
endif()
add_compile_definitions(TaoQuickImport="${TaoQuickImport}")
add_compile_definitions(TaoQuickImage="${TaoQuickImage}")
add_compile_definitions(TaoQuickImportPath="${TaoQuickImport}")
add_compile_definitions(TaoQuickImportPath="${TaoQuickImportPath}")
#add_compile_definitions(QML_IMPORT_PATH="${TaoQuickPath}")
#add_compile_definitions(QML2_IMPORT_PATH="${TaoQuickPath}")