-
Notifications
You must be signed in to change notification settings - Fork 836
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add qml #449
Open
bansan85
wants to merge
27
commits into
paceholder:master
Choose a base branch
from
bansan85:add_qml
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+4,326
−611
Open
Add qml #449
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
0aa87ed
Fix CMake warnings
bansan85 94be995
Fix MSVC warnings
bansan85 c96829b
Add calculator_test
bansan85 5bf9066
Missing MultiplicationModel.hpp in CMakeLists.txt
bansan85 c51ebc3
Minors fixes in library
bansan85 8c6b9fc
Apply clang-format
bansan85 285ebc9
Remove qml debug messages
bansan85 dc79eaf
IWYU qml
bansan85 31a267e
IWYU
bansan85 05752dd
Avoid overlap between connections and nodes
bansan85 144a7eb
Add Acquisition Viewer
bansan85 c755681
Fix Dynamic ports example
bansan85 671b4c4
Add Compute viewer that embedded parameters
bansan85 9639b52
Fix Load / Save for Acquisition Viewer
bansan85 0ea5f78
Implement full compute_viewer
bansan85 9860f83
Call WINDEPLOYQT_EXECUTABLE for all example
bansan85 4f8f543
Don't skip default action for mouse event
bansan85 ef934e0
Use ResultWidget
bansan85 2941a32
Add images for examples
bansan85 c650806
Add package init in Config.cmake.in
bansan85 cc44a1c
Fix examples Win static build
bansan85 ee0860d
Fix format and dedicated CI
bansan85 7290349
Remove openGL dependency
bansan85 7cc0759
Fix CI and reduce dependencies
bansan85 a70646d
Fix usage of dataInvalidated
bansan85 0888da8
Fix typos
bansan85 a195372
setPortData should return true if success
bansan85 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,10 @@ | ||
cmake_minimum_required(VERSION 3.8) | ||
|
||
cmake_policy(SET CMP0072 NEW) # new in 3.11. The NEW behavior for this policy is to set OpenGL_GL_PREFERENCE to GLVND. | ||
cmake_policy(SET CMP0068 NEW) # new in 3.9. The NEW behavior of this policy is to ignore the RPATH settings for install_name on macOS. | ||
|
||
|
||
project(QtNodesLibrary CXX) | ||
|
||
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) | ||
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") | ||
|
||
set(CMAKE_CXX_STANDARD 11) | ||
|
||
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) | ||
set(CMAKE_DISABLE_SOURCE_CHANGES ON) | ||
|
@@ -188,12 +186,6 @@ if(NOT "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") | |
) | ||
endif() | ||
|
||
if(QT_NODES_DEVELOPER_DEFAULTS) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This variable is not defined anywhere. |
||
target_compile_features(QtNodes PUBLIC cxx_std_14) | ||
set_target_properties(QtNodes PROPERTIES CXX_EXTENSIONS OFF) | ||
endif() | ||
|
||
|
||
set_target_properties(QtNodes | ||
PROPERTIES | ||
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ set(CALC_HEADER_FILES | |
|
||
add_executable(calculator | ||
${CALC_SOURCE_FILES} | ||
${CALC_HEAEDR_FILES} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Miss spelling |
||
${CALC_HEADER_FILES} | ||
) | ||
|
||
target_link_libraries(calculator QtNodes) | ||
|
@@ -33,7 +33,7 @@ set(HEADLESS_CALC_SOURCE_FILES | |
|
||
add_executable(headless_calculator | ||
${HEADLESS_CALC_SOURCE_FILES} | ||
${CALC_HEAEDR_FILES} | ||
${CALC_HEADER_FILES} | ||
) | ||
|
||
target_link_libraries(headless_calculator QtNodes) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CMAKE_MODULE_PATH is a list. Better use
list(APPEND
. See https://stackoverflow.com/questions/52730397/how-can-i-set-cmake-module-path-for-doing-regular-and-out-of-source-builds-in-cm