From c2b04effb2ee0ce13fe2b358de69afc58c55b607 Mon Sep 17 00:00:00 2001
From: jared <jared2020@163.com>
Date: Tue, 10 Nov 2020 13:55:51 +0800
Subject: [PATCH] update Table

---
 cmake/taoVersion.cmake                                      | 2 +-
 examples/TaoQuickShow/CMakeLists.txt                        | 2 +-
 src/TaoQuick/imports/TaoQuick/Qml/CusTable/CusTableView.qml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/taoVersion.cmake b/cmake/taoVersion.cmake
index 8174326..414ce8c 100644
--- a/cmake/taoVersion.cmake
+++ b/cmake/taoVersion.cmake
@@ -14,7 +14,7 @@ if (OUTPUT)
 endif()
 message("REVISION ${REVISION}")
 add_compile_definitions(TaoREVISION=${REVISION})
-add_compile_definitions(TaoREVISION="${REVISION}")
+add_compile_definitions(TaoREVISIONSTR="${REVISION}")
 
 set (TAG "0.0.0.0")
 execute_process(
diff --git a/examples/TaoQuickShow/CMakeLists.txt b/examples/TaoQuickShow/CMakeLists.txt
index c203d4b..5097ad8 100644
--- a/examples/TaoQuickShow/CMakeLists.txt
+++ b/examples/TaoQuickShow/CMakeLists.txt
@@ -26,8 +26,8 @@ if (CMAKE_BUILD_TYPE MATCHES "Release")
             ${SRC2}
             ${TaoCommonFiles}
             ${Res}
-            App.rc
             ${TaoQuickRes}
+            App.rc
             )
     elseif(APPLE)
         add_executable(${TargetName}
diff --git a/src/TaoQuick/imports/TaoQuick/Qml/CusTable/CusTableView.qml b/src/TaoQuick/imports/TaoQuick/Qml/CusTable/CusTableView.qml
index 2f0931e..6e1b278 100644
--- a/src/TaoQuick/imports/TaoQuick/Qml/CusTable/CusTableView.qml
+++ b/src/TaoQuick/imports/TaoQuick/Qml/CusTable/CusTableView.qml
@@ -34,7 +34,7 @@ ListView {
         active: visible
         snapMode: ScrollBar.SnapAlways
         stepSize: cusTableView.height/(cusTableView.model.visibledCount * CusConfig.fixedHeight) / 2
-        size: Math.max(cusTableView.height / cusTableView.content.height, 0.1)
+        size: Math.max(cusTableView.height / cusTableView.contentHeight, 0.1)
     }
     CusShortCutKeys {
         id: tableKeys