Skip to content

Commit

Permalink
Merge updates for Issue ultravnc#225 (ultravnc#231)
Browse files Browse the repository at this point in the history
* Hotfix failed of cmake command for "Windows with cmake, using ninja build system, and address santitizer enabled" erase lines with files code file deleted
Remove line 42 of winvnc/CMakeLists.txt
read_write_ini.cpp
Remove lines 83 and 84 of winvnc/CMakeLists.txt
vncproperties.cpp
vncpropertiesPoll.cpp
	modified:   cmake/winvnc/CMakeLists.txt

* Reapply changes of UltraVNC-QtCommunityTests.pro and Update for a better version of gitignore
	modified:   .gitignore
	modified:   UltraVNC-QtCommunityTests.pro

* Clean up UltraVNC-QtCommunityTests.files from deleted files ultravnc#225
vncproperties.cpp, vncproperties.h, vncpropertiesPoll.cpp and vncpropertiesPoll.h
UltraVNC-QtCommunityTests.pro and cmake/winvnc/CMakeLists.txt are clean too.
	modified:   UltraVNC-QtCommunityTests.files

---------

Co-authored-by: jose94752 <[email protected]>
  • Loading branch information
jose94752 and jose94752 authored Oct 24, 2024
1 parent 619a67b commit 920729b
Show file tree
Hide file tree
Showing 4 changed files with 192 additions and 78 deletions.
85 changes: 85 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,88 @@ zipunzip_src/zip20/windll/visualc/lib/Release/
zipunzip_src/zip20/windll/visualc/lib/x64/
vncviewer/vcpkg_installed/
winvnc/winvnc/vcpkg_installed/


# CMakeSpecific Ignore configuration file
CMakeUserPresets.json


# Qt Specific gitignore

# Customized ignore section ---------------------------
.qtc_clangd/

build/
UltraVNC-UltraVNC-QtComminunityTests.pro.user

addon/Debug/
addon/eventMessageLogger/MSG00001.bin
addon/ms-logon/MSLogonACL/buildtime.h
addon/ms-logon/authSSP/buildtime.h

cmake/CMakeUserPresets.json
cmake/build/
cmake/out/

vcpkg-configuration.json

# End Customized ignore section ----------------------

# Comment the "Customized ignore section" upper if you want the original gitignore for Qt from GitHub

# C++ objects and libs
*.slo
*.lo
*.o
*.a
*.la
*.lai
*.so
*.so.*
*.dll
*.dylib

# Qt-es
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
/.qmake.cache
/.qmake.stash
*.pro.user
*.pro.user.*
*.qbs.user
*.qbs.user.*
*.moc
moc_*.cpp
moc_*.h
qrc_*.cpp
ui_*.h
*.qmlc
*.jsc
Makefile*
*build-*
*.qm
*.prl

# Qt unit tests
target_wrapper.*

# QtCreator
*.autosave

# QtCreator Qml
*.qmlproject.user
*.qmlproject.user.*

# QtCreator CMake
CMakeLists.txt.user*

# QtCreator 4.8< compilation database
compile_commands.json

# QtCreator local machine specific files for imported projects
*creator.user*

*_qmlcache.qrc

# End Qt Specific gitignore
4 changes: 0 additions & 4 deletions UltraVNC-QtCommunityTests.files
Original file line number Diff line number Diff line change
Expand Up @@ -930,10 +930,6 @@ winvnc/winvnc/vncmenu.cpp
winvnc/winvnc/vncmenu.h
winvnc/winvnc/vncntlm.cpp
winvnc/winvnc/vncpasswd.h
winvnc/winvnc/vncproperties.cpp
winvnc/winvnc/vncproperties.h
winvnc/winvnc/vncpropertiesPoll.cpp
winvnc/winvnc/vncpropertiesPoll.h
winvnc/winvnc/vncserver.cpp
winvnc/winvnc/vncserver.h
winvnc/winvnc/vncsetauth.cpp
Expand Down
Loading

0 comments on commit 920729b

Please sign in to comment.