From 8463f9c49506bb0f2e8a0c0c992776b770f53863 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 4 Aug 2023 15:58:47 -0700 Subject: [PATCH] simplifying further --- .../index/main.cpp.49FBEF79F06E80B4.idx | Bin 996 -> 928 bytes .../mocs_compilation.cpp.FBFD039A0E1845F5.idx | Bin 0 -> 616 bytes CMakeLists.txt | 38 ++++++++++++++++-- build.sh | 6 ++- compile_commands.json | 15 +++---- src/CMakeLists.txt | 37 ----------------- src/main.cpp | 2 +- src/qml.qrc | 5 --- 8 files changed, 45 insertions(+), 58 deletions(-) create mode 100644 .cache/clangd/index/mocs_compilation.cpp.FBFD039A0E1845F5.idx delete mode 100644 src/CMakeLists.txt delete mode 100644 src/qml.qrc diff --git a/.cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx b/.cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx index dfcbe24bf16deb640ac485cd0114707cf4e91e63..7ac6d00a128204ce52dc2d2253ba5d81c3226a9a 100644 GIT binary patch literal 928 zcmWIYbaR`*%)sEB;#rZKT9U}Zz`!5`#Kk2=nKg_+aiBoOoT-y?^A9Nq9RF$8c5jzO zyw1m?Vb+(=ym}Q=b5p@}&lD%-RQ~&Q60uiOZ(eI*DF5@0|Bmd!DFIQDHKNnZmI)2FfbT)tYhvBt)-t7e+M+RHaT50$3vNjWLG@0{A@lF}CA z8#CP;j)%P6z$PchXqlBWLraQPx_^~b@su;=Zd|-8c7B?wFhzJ*?I|HA)rBwYV$`La zco&9QJk}N8;$*#Vk4jLRF>BuOH4J~dcumeo^6EY|oqUKf+~@SG9aBDP?CM(Q`0&|- z#tN4euUBonQfJVST(mN-q(Jy+B9CKHTwj}jWAN^<0&$Zq^~-;&{1^TFb$@-)Llwhq z{B~b&G|%gPclO3EcNdK?dn^8>;p_Z+-0wYi&0e$Q#lHI=l8^sAXmQ&4^n$*M+d?1C z9bz+mb9&a3HDdfLoP_88(Ae_8)hFeInZb63y+$mqGv3__Q%skYnw!-b^<}!18dI0? z+WDb%e}B|D+cECmmR?v~nVTdJjEj!*np-_IrXJ*BP-0+EWM*OJ024qN2q;QTD=q-W zRmWaAjS1g2@G$Zya)@#$!=z^%=Qc`Paa{-~%*w(l05k1m!jEMRH-mIRss%ViV8UPP zGH)-J-mJ&S0yd=YuC>^uaNWKcdpDgZt=2Gs3d2-SntjsOsXoLR&5#S%Tg#`jobg37 zq5(hNzzB)LdI5oDWpZD#!|VNv``Lp1dW>Wk6weDRu>z>Ps$q ze}4ViRSh(RorPTzCJb{Zngc6pztkLYa@&L^4AaHPg%Xq>#5V{X2<$oo@(wo#KTOr< z$=80KI-~j-&5)whoJ3F{7Z)WLgF>5G(RxR`M4;t@9ZU-H3<@AA2mnPQ6eQ=S>Qk2e8PNEe4>0Jd_sKUd}4f(d=k7og8Xva0*o>Y0P;{#7XSbN literal 996 zcmWIYbaT7I%)sEB;#rZKT9U}Zz`!5`#Kk2=nL8O77&ZX~D&|ZLzMXg5famIe7NhBl zP9JWt$>|f9=$^gPd!oDZ#E9t|bR>7B+`jLhc}Z1rTNxWm*L3HuMST*_dy1cC^!I%a zd$?z=k3{^H*=q6k#m}z#Q?g|m|I?d0w9RgR{X2d0;&owHs{+^Ti`}W$({8lCA^-Hz zO*iHoP_?-!r^s=)@|D9fwFOGfdoPr(PZamm{@@p9AuZUPdyzqMqT&azD(y_zn_yn9$%k2ZwY^2$^)m#A5x-@T~_*k znf;CA_8$HfEu1RnrRwcWL(5*|mI&=sGT*;1blF-FsXvnoIMV!WzZ{BYZk{kVZ}&@9xFy%Z!iJ1{7P)^jZF9SDEaCS~K6*Vo{p2Z|bI8D6eyP8O$nN z|KafLeN#Uho%(-dsYl*ji62InIKIfXy}wqfY$T+AY~ku7CU1{Faha5Cb!$?V;h)Mw z_MHFN-hE)La#Wjq_<%wcyS32-j)R}PN`A~NS#(iyzN*l_W9idum;GRG2o!Fz>g+$f zz|-#kyhB@33TjqfR#>oa#n*Ibc*buKgw_lv0xH30M9vG7y=QX!_XiPoG!=TB) zpux<-%mF5VG7wOdnpRu@jOmWOavBr9ZQx<#(clo}P=-m*IL>X9w&J=FP?(j4RRCt% z$%G%v9Bu~bf>aA|h`@xu)@9yaF1=Zgkp*l>-(735OX0eGGxlyeQCh8G0u_d-o;3TU zuTy=9Gnye6uD6y?XF21GW=QeA8`rXL=A;8vbMbQt!wgY9&#Ae#MmQg+npKb$?vh;h zLp*s)l*@p^>{9FsFx8h_^#1(%wW}Iv2s;bABup6QP&5Zt)PAWs;^ejoO&F$&kqad# zKZtJ-IuO`(2IL)X4t|)b&y%nHJatC(GnyeqsX2+DKrSvyE(V1*v&OVY&A?e(BC03c~W-JQ9Lp PqP%=U0wSvX;*81w*Cu-L diff --git a/.cache/clangd/index/mocs_compilation.cpp.FBFD039A0E1845F5.idx b/.cache/clangd/index/mocs_compilation.cpp.FBFD039A0E1845F5.idx new file mode 100644 index 0000000000000000000000000000000000000000..ddceb342f072b97acca7c3f785a16263b8053163 GIT binary patch literal 616 zcmWIYbaP8!VqkDi@vO*AElFfyU|DQtMv)9FLz9N0Svsu4YNAuGLD;=vPXK%YJ>TPpg5U0U0ZRX#9GbcV%pCaUydLUhN z#n+&-Us9Z2)ND>Y`>XC?*xT>lGk)Hf*R=a++4g<^E4^}dg>IjxAI2}fa`S_Yx#vE_ zTF2{cbKlY0yq!zPy!MEkizJg(Nyg5b5zN1P+~%oDoIjcUlwqzxq?QxwLjV1@+5&tv zj!mC2MfHlXRLB=g4p-H-o2ipeRUG6!!pzTg$2e+(O%*${xb1bVCWAYfm47x=McoaF zKk(q6E%VnY7iK*1*=;lPis{ZZ`#e8vU3GdVt1ipzdrqv|`kRF|UMcv=Ut9g8KJ(wb z_g?G%WY$PD>l^nicpviXt+TyT;55^|cc)(Y$}B#qam;6n^UBa)Hy#Ebk3C%T%M5-F&1l zjqi@(^UI8L)i#z`Y|?W1#1$x!sZm^+n`8%!4{@FSDc1z&1h6tFGBC(9u`&sR37`xZ zxUbjWpD(E}k)J^UBrV3I116xd3`MDF#d<&v%oIj0thzzMK&>!UMX5Q7AQOs4 zG^6}p8^+>iY}|be49U4EIqE<$X;oP!W)@a9b`DN1K4Cs7K2bgqJ|RAFJ~2K?J_%kP ML4G-I0Y(`H0I0C&Z2$lO literal 0 HcmV?d00001 diff --git a/CMakeLists.txt b/CMakeLists.txt index 331babb..e0e2b47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,45 @@ cmake_minimum_required(VERSION 2.8) +set(PROJECT_NAME "MinimalQml") +project(${PROJECT_NAME} LANGUAGES CXX) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + # 3rd party tools find_package(Qt5 COMPONENTS Widgets Qml Quick - REQUIRED) + REQUIRED +) -# Directory with the source code -add_subdirectory(src) +# not sure if needed +include_directories(${Qt5Widgets_INCLUDE_DIRS} ${QtQml_INCLUDE_DIRS}) +add_definitions(${Qt5Widgets_DEFINITIONS} ${QtQml_DEFINITIONS} ${${Qt5Quick_DEFINITIONS}}) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +# get all files together +if(NOT DEFINED HEADERS) + file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h) +endif() +if(NOT DEFINED SOURCES) + file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) +endif() +# print out the files +message(STATUS "HEADERS: ${HEADERS}") +message(STATUS "SOURCES: ${SOURCES}") +source_group("Header Files" FILES ${HEADERS}) +source_group("Source Files" FILES ${SOURCES}) + +add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES} ${QT_RESOURCES}) + +target_link_libraries(${PROJECT_NAME} + Qt5::Widgets + Qt5::Qml + Qt5::Quick +) diff --git a/build.sh b/build.sh index f75f784..5729916 100755 --- a/build.sh +++ b/build.sh @@ -6,7 +6,9 @@ mkdir build && cd build && echo "Running cmake with build type Debug." -cmake -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_PREFIX_PATH=$HOME/Qt/5.15.14/gcc_64/ -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug .. && +cmake -DCMAKE_PREFIX_PATH=$HOME/Qt/5.15.14/gcc_64/ \ + -G "Unix Makefiles" \ + -DCMAKE_BUILD_TYPE=Debug .. && echo "=====================" echo "Running make..." @@ -23,4 +25,4 @@ cp build/compile_commands.json . && echo "=====================" echo "running app" echo "=====================" -./build/src/MinimalQml +./build/MinimalQml diff --git a/compile_commands.json b/compile_commands.json index cb02141..37fd7cb 100644 --- a/compile_commands.json +++ b/compile_commands.json @@ -1,17 +1,12 @@ [ { - "directory": "/home/talksik/code/MinimalQml/build/src", - "command": "/usr/bin/g++ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -I/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtWidgets -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtGui -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtCore -isystem /home/talksik/Qt/5.15.14/gcc_64/./mkspecs/linux-g++ -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQml -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtNetwork -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQuick -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQmlModels -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable -g -fPIC -o CMakeFiles/MinimalQml.dir/MinimalQml_autogen/mocs_compilation.cpp.o -c /home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/mocs_compilation.cpp", - "file": "/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/mocs_compilation.cpp" + "directory": "/home/talksik/code/MinimalQml/build", + "command": "/usr/bin/g++ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -I/home/talksik/code/MinimalQml/build/MinimalQml_autogen/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtWidgets -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtGui -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtCore -isystem /home/talksik/Qt/5.15.14/gcc_64/./mkspecs/linux-g++ -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQml -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtNetwork -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQuick -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQmlModels -g -fPIC -std=gnu++11 -o CMakeFiles/MinimalQml.dir/MinimalQml_autogen/mocs_compilation.cpp.o -c /home/talksik/code/MinimalQml/build/MinimalQml_autogen/mocs_compilation.cpp", + "file": "/home/talksik/code/MinimalQml/build/MinimalQml_autogen/mocs_compilation.cpp" }, { - "directory": "/home/talksik/code/MinimalQml/build/src", - "command": "/usr/bin/g++ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -I/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtWidgets -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtGui -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtCore -isystem /home/talksik/Qt/5.15.14/gcc_64/./mkspecs/linux-g++ -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQml -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtNetwork -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQuick -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQmlModels -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable -g -fPIC -o CMakeFiles/MinimalQml.dir/main.cpp.o -c /home/talksik/code/MinimalQml/src/main.cpp", + "directory": "/home/talksik/code/MinimalQml/build", + "command": "/usr/bin/g++ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -I/home/talksik/code/MinimalQml/build/MinimalQml_autogen/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtWidgets -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtGui -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtCore -isystem /home/talksik/Qt/5.15.14/gcc_64/./mkspecs/linux-g++ -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQml -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtNetwork -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQuick -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQmlModels -g -fPIC -std=gnu++11 -o CMakeFiles/MinimalQml.dir/src/main.cpp.o -c /home/talksik/code/MinimalQml/src/main.cpp", "file": "/home/talksik/code/MinimalQml/src/main.cpp" -}, -{ - "directory": "/home/talksik/code/MinimalQml/build/src", - "command": "/usr/bin/g++ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -I/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtWidgets -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtGui -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtCore -isystem /home/talksik/Qt/5.15.14/gcc_64/./mkspecs/linux-g++ -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQml -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtNetwork -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQuick -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQmlModels -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable -g -fPIC -o CMakeFiles/MinimalQml.dir/qrc_qml.cpp.o -c /home/talksik/code/MinimalQml/build/src/qrc_qml.cpp", - "file": "/home/talksik/code/MinimalQml/build/src/qrc_qml.cpp" } ] \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index f72de1f..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -include_directories(${Qt5Widgets_INCLUDE_DIRS} ${QtQml_INCLUDE_DIRS}) -add_definitions(${Qt5Widgets_DEFINITIONS} ${QtQml_DEFINITIONS} ${${Qt5Quick_DEFINITIONS}}) - -qt5_add_resources(QT_RESOURCES qml.qrc) - - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - - -set(PROJECT "MinimalQml") - -project(${PROJECT}) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable") - -if(NOT DEFINED HEADERS) - file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) -endif() - -if(NOT DEFINED SOURCES) - file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) -endif() - -source_group("Header Files" FILES ${HEADERS}) -source_group("Source Files" FILES ${SOURCES}) - -add_executable(${PROJECT} ${HEADERS} ${SOURCES} ${QT_RESOURCES}) - -target_link_libraries(${PROJECT} - Qt5::Widgets - Qt5::Qml - Qt5::Quick -) - diff --git a/src/main.cpp b/src/main.cpp index 1b051de..927d3a3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) QApplication app(argc, argv); QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + engine.load(QUrl(QStringLiteral("./src/main.qml"))); return app.exec(); } diff --git a/src/qml.qrc b/src/qml.qrc deleted file mode 100644 index 5f6483a..0000000 --- a/src/qml.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - main.qml - -