NEWS

@@ -1,4 +1,4 @@
-2.1.0 (2024-12-19) "Bunnyrific"
+Unreleased
 
  * xC: fixed a crash when the channel topic had too many formatting items
 

README.adoc

@@ -35,8 +35,7 @@ image::xP.webp[align="center"]
 
 xA, xT, xW, xM
 --------------
-Fyne, Qt Widgets, Win32, Cocoa frontends for 'xC'.
-Using them is not recommended.
+Other frontends for 'xC'.  Using them is not recommended.
 
 xD
 --
@@ -151,13 +150,7 @@ xA
 ~~
 The Fyne frontend supports all of Linux, FreeBSD, Windows, macOS, Android, and
 iOS natively, albeit somewhat poorly.  Only use `fyne` or `fyne-cross` after
-running `make generate` first.
-
-xT
-~~
-The Qt Widgets frontend is a separate CMake subproject.  It generally supports
-all desktop operating systems.  To avoid having to specify the relay address
-each time you run it, pass it on the command line.
+running `make` first.
 
 xW
 ~~

xK-version

@@ -1 +1 @@
-2.1.0
+2.0.0

xT/CMakeLists.txt

@@ -109,10 +109,8 @@ include (GNUInstallDirs)
 if (ANDROID)
 	install (TARGETS xT DESTINATION .)
 elseif (APPLE OR WIN32)
-	install (TARGETS xT
-		BUNDLE DESTINATION .
-		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
+	# TODO(p): Consider whether or not to use MSYS2.
+	install (TARGETS xT DESTINATION .)
 	# XXX: QTBUG-127075, which can be circumvented by manually running
 	# macdeployqt on xT.app before the install.
 	qt_generate_deploy_app_script (TARGET xT OUTPUT_SCRIPT deploy_xT)
@@ -129,26 +127,6 @@ else ()
 		DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
 endif ()
 
-# Within MSYS2, windeployqt doesn't copy the compiler runtime,
-# which is always linked dynamically by the Qt binaries.
-# TODO(p): Consider whether or not to use MSYS2 to cross-compile, and how.
-if (WIN32)
-	install (CODE [=[
-	set (bindir "${CMAKE_INSTALL_PREFIX}/bin")
-	execute_process (COMMAND cygpath -m /
-		OUTPUT_VARIABLE cygroot OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if (cygroot)
-		execute_process (COMMAND ldd "${bindir}/xT.exe"
-			OUTPUT_VARIABLE ldd_output OUTPUT_STRIP_TRAILING_WHITESPACE)
-		string (REGEX MATCHALL " /mingw64/bin/[^ ]+ " libs "${ldd_output}")
-		foreach (lib ${libs})
-			string (STRIP "${lib}" lib)
-			file (COPY "${cygroot}${lib}" DESTINATION "${bindir}")
-		endforeach()
-	endif ()
-	]=])
-endif ()
-
 # CPack
 set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
 set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")

xT/xT.cpp

@@ -1421,7 +1421,6 @@ static void
 build_main_window()
 {
 	g.wMain = new QMainWindow;
-	refresh_icon();
 
 	auto central = new QWidget(g.wMain);
 	auto vbox = new QVBoxLayout(central);