Relaxed the standard requirements to c++11
This commit is contained in:
parent
838b431532
commit
483993df1e
|
@ -42,12 +42,12 @@ include_directories(include include/Qt)
|
|||
|
||||
# Shared version for distributing
|
||||
add_library(${PROJECT_NAME} SHARED ${SRC_LIST} ${HEADERS_LIST})
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::Quick)
|
||||
|
||||
# Static version for testing
|
||||
add_library("${PROJECT_NAME}Static" STATIC ${SRC_LIST} ${HEADERS_LIST})
|
||||
set_property(TARGET "${PROJECT_NAME}Static" PROPERTY CXX_STANDARD 14)
|
||||
set_property(TARGET "${PROJECT_NAME}Static" PROPERTY CXX_STANDARD 11)
|
||||
target_link_libraries("${PROJECT_NAME}Static" PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::Quick)
|
||||
|
||||
# Install directive for header files
|
||||
|
|
|
@ -13,5 +13,5 @@ find_package(Qt5Test REQUIRED)
|
|||
find_package(Qt5Quick REQUIRED)
|
||||
|
||||
add_executable(${PROJECT_NAME} Resources.qrc test_dotherside.cpp main.qml)
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
|
||||
target_link_libraries(${PROJECT_NAME} DOtherSideStatic Qt5::Quick Qt5::Widgets Qt5::Test Qt5::Core)
|
||||
|
|
|
@ -294,7 +294,7 @@ private slots:
|
|||
slotDefinitions,
|
||||
propertyDefinitions);
|
||||
|
||||
auto moh = std::make_unique<DosIQMetaObjectHolder>(mo);
|
||||
std::unique_ptr<DosIQMetaObjectHolder> moh(new DosIQMetaObjectHolder(mo));
|
||||
|
||||
QString value = "";
|
||||
auto ose = [&value](const QString & name, const std::vector<QVariant> &args) -> QVariant {
|
||||
|
|
Loading…
Reference in New Issue