Mercurial > hg > toolkit / changeset

--- a/configure	Sat Dec 27 22:18:48 2025 +0100
+++ b/configure	Sat Dec 27 22:35:49 2025 +0100
@@ -85,7 +85,10 @@
 printhelp()
 {
     echo "Usage: $0 [OPTIONS]..."
-    echo 'Configuration:'
+    if [ $has_overridable_config_vars__ -eq 1 ] ; then
+        echo
+        echo "Configuration:"
+    fi
     cat << '__EOF__'
 
 Build Types:
@@ -116,6 +119,7 @@
 touch "$TEMP_DIR/features"
 
 # config variables
+has_overridable_config_vars__=0
 
 # features
 
@@ -236,16 +240,13 @@
 
 
 # generate vars.mk
-cat > "$TEMP_DIR/vars.mk" << __EOF__
-__EOF__
-
+echo '# configuration' > "$TEMP_DIR/vars.mk"
+echo >> "$TEMP_DIR/vars.mk"
 
 #
 # DEPENDENCIES
 #
 
-
-
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"
 
@@ -940,6 +941,11 @@
             break
         fi
         fi
+        if checkopt_toolkit_libadwaita ; then
+            echo "  toolkit: libadwaita" >> "$TEMP_DIR/options"
+            ERROR=0
+            break
+        fi
         if checkopt_toolkit_gtk4 ; then
             echo "  toolkit: gtk4" >> "$TEMP_DIR/options"
             ERROR=0
@@ -950,6 +956,11 @@
             ERROR=0
             break
         fi
+        if checkopt_toolkit_qt5 ; then
+            echo "  toolkit: qt5" >> "$TEMP_DIR/options"
+            ERROR=0
+            break
+        fi
         if checkopt_toolkit_gtk2 ; then
             echo "  toolkit: gtk2" >> "$TEMP_DIR/options"
             ERROR=0
@@ -1126,8 +1137,10 @@
 if [ -n "$TOOLCHAIN_CSTD" ]; then
     echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
-echo
-echo "Config:"
+if [ $has_overridable_config_vars__ -eq 1 ]; then
+    echo
+    echo "Config:"
+fi
 echo
 echo "Options:"
 cat "$TEMP_DIR/options"

--- a/make/configure.vm	Sat Dec 27 22:18:48 2025 +0100
+++ b/make/configure.vm	Sat Dec 27 22:35:49 2025 +0100
@@ -86,7 +86,10 @@
 printhelp()
 {
     echo "Usage: $0 [OPTIONS]..."
-    echo 'Configuration:'
+    if [ $has_overridable_config_vars__ -eq 1 ] ; then
+        echo
+        echo "Configuration:"
+    fi
 #foreach( $cfg in $config )
 if true \
 #if( $cfg.platform )
@@ -99,7 +102,7 @@
     :
     #foreach( $var in $cfg.vars )
     #if( $var.overridable )
-    if test -z "${D}${var.varName}__described__"; then
+    if [ -z "${D}${var.varName}__described__" ] ; then
         ${var.varName}__described__=1
         cat << '__EOF__'
 ${var.helpText}
@@ -147,6 +150,7 @@
 touch "$TEMP_DIR/features"
 
 # config variables
+has_overridable_config_vars__=0
 #foreach( $cfg in $config )
 if true \
 #if( $cfg.platform )
@@ -158,7 +162,10 @@
       ; then
     :
     #foreach( $var in $cfg.vars )
-    if test -z "${D}${var.varName}__initialized__"; then
+    if [ -z "${D}${var.varName}__initialized__" ] ; then
+        #if( $var.overridable )
+        has_overridable_config_vars__=1
+        #end
         ${var.varName}__initialized__=1
         #if( $var.exec )
         ${var.varName}=`${var.value}`
@@ -304,19 +311,16 @@
 ## End of unparsed content **
 
 # generate vars.mk
-cat > "$TEMP_DIR/vars.mk" << __EOF__
+echo '# configuration' > "$TEMP_DIR/vars.mk"
 #foreach( $var in $vars )
-${var.varName}=${D}${var.varName}
+echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
 #end
-__EOF__
-
+echo >> "$TEMP_DIR/vars.mk"
 
 #
 # DEPENDENCIES
 #
 
-
-
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"
 
@@ -714,14 +718,18 @@
 if [ -n "$TOOLCHAIN_CSTD" ]; then
     echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
-echo
-echo "Config:"
+if [ ${D}has_overridable_config_vars__ -eq 1 ]; then
+    echo
+    echo "Config:"
 #foreach( $var in $vars )
 #if ($var.overridable)
-    printf '  %-16s' '${var.arg}:'
-    echo "${D}${var.varName}"
+    if [ -n "${D}${var.varName}__initialized__" ]; then
+        printf '  %-16s' '${var.arg}:'
+        echo "${D}${var.varName}"
+    fi
 #end
 #end
+fi
 #if ( $options.size() > 0 )
 echo
 echo "Options:"

--- a/make/project.xml	Sat Dec 27 22:18:48 2025 +0100
+++ b/make/project.xml	Sat Dec 27 22:35:49 2025 +0100
@@ -170,9 +170,10 @@
 			</value>
 			<default value="winui" platform="windows" />
 			<default value="cocoa" platform="macos" />
+			<default value="libadwaita" />
 			<default value="gtk4" />
 			<default value="gtk3" />
-			<!--<default value="qt5" />-->
+			<default value="qt5" />
 			<default value="gtk2" />
 			<default value="qt4" />
 			<default value="motif" />