git.iko.soy/unity8
on xenial help sign in
import qml files into cmake, drop qmlproject
ebd5d11Michael Zanetti
src/CMakeLists.txt+4−1
compare with xenial
unifiedsplit
@@ -5,11 +5,14 @@ include_directories(
5 ${UNITY-MIR_INCLUDE_DIRS}
5 ${UNITY-MIR_INCLUDE_DIRS}
6)
6)
7
7
8+file(GLOB_RECURSE QML_FILES ${CMAKE_SOURCE_DIR}/qml/*)
9+
8add_executable(${SHELL_APP}
10add_executable(${SHELL_APP}
9 ApplicationArguments.h
11 ApplicationArguments.h
10 main.cpp
12 main.cpp
11 MouseTouchAdaptor.cpp
13 MouseTouchAdaptor.cpp
14+ ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
12− )
15+)
13
16
14qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
17qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
15pkg_check_modules(XCB REQUIRED xcb)
18pkg_check_modules(XCB REQUIRED xcb)
unity8.qmlprojectdeleted−25
@@ -1,25 +0,0 @@
1−/* File generated by Qt Creator, version 2.4.1 */
2−
3−import QmlProject 1.1
4−
5−Project {
6− mainFile: "Shell.qml"
7−
8− /* Include .qml, .js, and image files from current directory and subdirectories */
9− QmlFiles {
10− directory: "."
11− }
12− JavaScriptFiles {
13− directory: "."
14− }
15− ImageFiles {
16− directory: "."
17− }
18− /* List of plugin directories passed to QML runtime */
19− importPaths: [
20− "builddir/plugins",
21− "builddir/modules",
22− "builddir/tests/plugins",
23− "builddir/tests/utils/modules"
24− ]
25−}