Commitb50583e

committed

Add Felgo Hot Reload

1 parentbc31fb6 commitb50583eCopy full SHA for b50583e

File tree

+88

-0

lines changed

+88

-0

lines changed

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,12 @@ install(TARGETS FelgoHotReloadDemo`
`59`	`59`	`BUNDLEDESTINATION .`
`60`	`60`	`LIBRARYDESTINATION${CMAKE_INSTALL_LIBDIR})`
`61`	`61`
	`62`	`+`
	`63`	`+set(FelgoHotReload_DIR"${FELGO_HOT_RELOAD_PATH}/lib/cmake/FelgoHotReload"CACHEPATH"FelgoHotReload directory" FORCE)`
	`64`	`+find_package(FelgoHotReload CONFIG REQUIRED)`
	`65`	`+`
	`66`	`+felgohotreload_configure_executable(${CURRENT_PROJECT_NAME})`
	`67`	`+`
`62`	`68`	`# Add a static plugin`
`63`	`69`	`add_subdirectory(qml_static_plugin)`
`64`	`70`	`target_link_libraries(FelgoHotReloadDemoPRIVATE`
`@@ -76,6 +82,19 @@ qt_add_qml_module(FelgoHotReloadDemo`
`76`	`82`	`NO_PLUGIN`
`77`	`83`	`QML_FILES qml_module/QmlModuleText.qml)`
`78`	`84`
	`85`	`+# Generate configuration file`
	`86`	`+cmake_path(`
	`87`	`+ RELATIVE_PATHCMAKE_CURRENT_BINARY_DIR`
	`88`	`+ BASE_DIRECTORY${CMAKE_SOURCE_DIR}`
	`89`	`+OUTPUT_VARIABLE FELGO_HOT_RELOAD_DEMO_BIN_DIR`
	`90`	`+)`
	`91`	`+`
	`92`	`+configure_file(`
	`93`	`+${CMAKE_SOURCE_DIR}/hot_reload_config_template.json.in# Template file`
	`94`	`+${CMAKE_SOURCE_DIR}/hot_reload_config.json# Configuration file`
	`95`	`+ @ONLY# Replace occurence of @VAR@`
	`96`	`+)`
	`97`	`+`
`79`	`98`	`if(QT_VERSION_MAJOREQUAL 6)`
`80`	`99`	`qt_import_qml_plugins(FelgoHotReloadDemo)`
`81`	`100`	`qt_finalize_executable(FelgoHotReloadDemo)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,5 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin`
`25`	`25`	`win32 {`
`26`	`26`	`QMAKE_LFLAGS_WINDOWS +=/DEBUG:NONE`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+include("$${FELGO_HOT_RELOAD_PATH}/qmake/FelgoHotReload.pri")`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,23 @@`
	`1`	`+{`
	`2`	`+"main_qml_file":"qml/main.qml",`
	`3`	`+`
	`4`	`+"qml_module_paths": [`
	`5`	`+"qml",`
	`6`	`+ {`
	`7`	`+"path":"qml_static_plugin",`
	`8`	`+"target_path":"DemoStaticPlugin"`
	`9`	`+ },`
	`10`	`+ {`
	`11`	`+"path":"qml_shared_plugin/qml",`
	`12`	`+"target_path":"Demo/SharedPlugin"`
	`13`	`+ },`
	`14`	`+ {`
	`15`	`+"path":"qml_module",`
	`16`	`+"target_path":"demo/qml/module"`
	`17`	`+ }`
	`18`	`+ ],`
	`19`	`+`
	`20`	`+"qml_plugin_paths": [],`
	`21`	`+`
	`22`	`+"use_local_plugins":true`
	`23`	`+}`

Lines changed: 36 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,36 @@`
	`1`	`+{`
	`2`	`+ "main_qml_file": "qml/main.qml",`
	`3`	`+`
	`4`	`+ "qml_module_paths": [`
	`5`	`+ "qml",`
	`6`	`+ {`
	`7`	`+ "path": "qml_static_plugin",`
	`8`	`+ "target_path": "DemoStaticPlugin"`
	`9`	`+ },`
	`10`	`+ {`
	`11`	`+ "path": "qml_shared_plugin",`
	`12`	`+ "target_path": "Demo/SharedPlugin"`
	`13`	`+ },`
	`14`	`+ {`
	`15`	`+ "path": "qml_module",`
	`16`	`+ "target_path": "demo/qml/module/qml_module"`
	`17`	`+ }`
	`18`	`+ ],`
	`19`	`+`
	`20`	`+ "qml_plugin_paths": [`
	`21`	`+ {`
	`22`	`+ "path": "@FELGO_HOT_RELOAD_DEMO_BIN_DIR@/DemoStaticPlugin",`
	`23`	`+ "target_path": "DemoStaticPlugin"`
	`24`	`+ },`
	`25`	`+ {`
	`26`	`+ "path": "@FELGO_HOT_RELOAD_DEMO_BIN_DIR@/Demo/SharedPlugin",`
	`27`	`+ "target_path": "Demo/SharedPlugin"`
	`28`	`+ },`
	`29`	`+ {`
	`30`	`+ "path": "@FELGO_HOT_RELOAD_DEMO_BIN_DIR@/demo/qml/module",`
	`31`	`+ "target_path": "demo/qml/module"`
	`32`	`+ }`
	`33`	`+ ],`
	`34`	`+`
	`35`	`+ "use_local_plugins": true`
	`36`	`+}`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@`
`2`	`2`	`#include<QQmlApplicationEngine>`
`3`	`3`	`#include<QStringLiteral>`
`4`	`4`
	`5`	`+#ifdef USE_FELGO_HOT_RELOAD`
	`6`	`+#include<FelgoHotReload>`
	`7`	`+#endif`
	`8`	`+`
`5`	`9`	`intmain(int argc,char *argv[])`
`6`	`10`	`{`
`7`	`11`
`@@ -12,7 +16,11 @@ int main(int argc, char *argv[])`
`12`	`16`	`QGuiApplicationapp(argc, argv);`
`13`	`17`	`QQmlApplicationEngine engine;`
`14`	`18`	`engine.addImportPath(":/");`
	`19`	`+#ifdef USE_FELGO_HOT_RELOAD`
	`20`	`+static FelgoHotReloadfelgoHotReload(&engine);`
	`21`	`+#else`
`15`	`22`	`engine.load(QUrl(QStringLiteral("qrc:/main.qml")));`
	`23`	`+#endif`
`16`	`24`	`constauto result = app.exec();`
`17`	`25`	`return result;`
`18`	`26`	`}`

Comments

(0)