update
This commit is contained in:
parent
f554e22377
commit
bd367dec8e
|
@ -15,7 +15,7 @@ endif()
|
||||||
file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
|
file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
|
||||||
|
|
||||||
#设置版本号
|
#设置版本号
|
||||||
add_definitions(-DVERSION=1,3,7,3)
|
add_definitions(-DVERSION=1,3,7,4)
|
||||||
|
|
||||||
#判断FluentUI库类型
|
#判断FluentUI库类型
|
||||||
if(FLUENTUI_BUILD_STATIC_LIB)
|
if(FLUENTUI_BUILD_STATIC_LIB)
|
||||||
|
|
|
@ -33,6 +33,7 @@ FluContentPage {
|
||||||
cellWidth: 80
|
cellWidth: 80
|
||||||
cellHeight: 80
|
cellHeight: 80
|
||||||
clip: true
|
clip: true
|
||||||
|
boundsBehavior: GridView.StopAtBounds
|
||||||
model:FluApp.awesomelist()
|
model:FluApp.awesomelist()
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
anchors{
|
anchors{
|
||||||
|
|
|
@ -25,6 +25,10 @@ CustomWindow {
|
||||||
event.accepted = false
|
event.accepted = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
FluTools.setQuitOnLastWindowClosed(false)
|
||||||
|
}
|
||||||
|
|
||||||
Connections{
|
Connections{
|
||||||
target: appInfo
|
target: appInfo
|
||||||
function onActiveWindow(){
|
function onActiveWindow(){
|
||||||
|
|
|
@ -37,7 +37,6 @@ int main(int argc, char *argv[])
|
||||||
if(!appInfo->isOwnerProcess(&ipc)){
|
if(!appInfo->isOwnerProcess(&ipc)){
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
app.setQuitOnLastWindowClosed(false);
|
|
||||||
QQmlApplicationEngine engine;
|
QQmlApplicationEngine engine;
|
||||||
FramelessHelper::Quick::registerTypes(&engine);
|
FramelessHelper::Quick::registerTypes(&engine);
|
||||||
#ifdef FLUENTUI_BUILD_STATIC_LIB
|
#ifdef FLUENTUI_BUILD_STATIC_LIB
|
||||||
|
|
|
@ -7,7 +7,7 @@ project(fluentuiplugin LANGUAGES CXX)
|
||||||
set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
|
set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
|
||||||
|
|
||||||
#设置版本号
|
#设置版本号
|
||||||
add_definitions(-DVERSION=1,3,7,3)
|
add_definitions(-DVERSION=1,3,7,4)
|
||||||
|
|
||||||
find_package(Qt5 REQUIRED COMPONENTS Core Quick Qml)
|
find_package(Qt5 REQUIRED COMPONENTS Core Quick Qml)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue