diff --git a/.cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx b/.cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx index dfcbe24..7ac6d00 100644 Binary files a/.cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx and b/.cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx differ 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 0000000..ddceb34 Binary files /dev/null and b/.cache/clangd/index/mocs_compilation.cpp.FBFD039A0E1845F5.idx differ 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 - -