Skip to content

Commit

Permalink
Merge branch 'main' of https://gitee.com/opguess/QSyncUi
Browse files Browse the repository at this point in the history
  • Loading branch information
kuilinggg committed Jul 9, 2024
2 parents ee7a553 + 7c99311 commit b7f12d4
Show file tree
Hide file tree
Showing 18 changed files with 233 additions and 886 deletions.
17 changes: 8 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ if (WINDOWS_BUILD AND AWSSDK_INSTALL_AS_SHARED_LIBS)
endif ()
set(PROJECT_SOURCES
main.cpp
loginwindow.cpp
loginwindow.h
loginwindow.ui



)

if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
Expand All @@ -49,9 +49,6 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
mycore.h mycore.cpp
user.h user.cpp
synctask.h synctask.cpp
awsutils.h awsutils.cpp
reset.h reset.cpp reset.ui
signin.h signin.cpp signin.ui
mainwindow.h mainwindow.cpp
homeview.h homeview.cpp
apirequest.h apirequest.cpp
Expand All @@ -72,8 +69,9 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
linknewfolder_window.h linknewfolder_window.cpp
tasktoken.h tasktoken.cpp
filecard.h filecard.cpp
signhelper.h signhelper.cpp
historycard.h historycard.cpp

xmlprocesser.h xmlprocesser.cpp

)
# Define target properties for Android with Qt 6 as:
Expand Down Expand Up @@ -102,8 +100,9 @@ include_directories(
thirdParty/ElaWidgetTools/include
thirdParty/wtr
)

target_link_libraries(QSyncUi PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Sql ${AWSSDK_LINK_LIBRARIES} elawidgettools)
find_package(Qt6 REQUIRED COMPONENTS Xml)
target_link_libraries(QSyncUi PRIVATE Qt6::Xml)
target_link_libraries(QSyncUi PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Xml Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Sql ${AWSSDK_LINK_LIBRARIES} elawidgettools)
# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
# If you are developing for iOS or macOS you should consider setting an
# explicit, fixed bundle identifier manually though.
Expand Down
117 changes: 0 additions & 117 deletions awsutils.cpp

This file was deleted.

40 changes: 0 additions & 40 deletions awsutils.h

This file was deleted.

73 changes: 0 additions & 73 deletions loginwindow.cpp

This file was deleted.

43 changes: 0 additions & 43 deletions loginwindow.h

This file was deleted.

Loading

0 comments on commit b7f12d4

Please sign in to comment.