fix qt build system

Thu, 09 Oct 2025 11:44:10 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Thu, 09 Oct 2025 11:44:10 +0200
changeset 821
2aa2f75f8da4
parent 820
7ce561f92632
child 822
54e43e4efac2

fix qt build system

application/main.c file | annotate | diff | comparison | revisions
ui/gtk/list.c file | annotate | diff | comparison | revisions
ui/qt/Makefile file | annotate | diff | comparison | revisions
ui/qt/qt5.pro file | annotate | diff | comparison | revisions
--- a/application/main.c	Wed Oct 08 22:00:20 2025 +0200
+++ b/application/main.c	Thu Oct 09 11:44:10 2025 +0200
@@ -470,6 +470,7 @@
         case 6: return (void*)(intptr_t)123;
         case 7: return "edit me";
         case 8: return "edit me too";
+        case 9: return (void*)(intptr_t)1;
     }
     return NULL;
 }
@@ -672,7 +673,7 @@
             }
         }
         ui_tab(obj, "Tab 1") {
-            UiModel *model = ui_model(obj->ctx, UI_ICON_TEXT, "col1", UI_INTEGER, "col2", UI_ICON, "col3", UI_ICON_TEXT, "col4", UI_INTEGER, "col5", UI_STRING_EDITABLE, "edit6", UI_STRING_EDITABLE, "edit7", -1);
+            UiModel *model = ui_model(obj->ctx, UI_ICON_TEXT, "col1", UI_INTEGER, "col2", UI_ICON, "col3", UI_ICON_TEXT, "col4", UI_INTEGER, "col5", UI_STRING_EDITABLE, "edit6", UI_STRING_EDITABLE, "edit7", UI_BOOL_EDITABLE, "Check", -1);
             model->columnsize[0] = -1;
             ui_table(obj, .model = model, .list = doc->list2, .colspan = 2, .fill = TRUE, .contextmenu = menubuilder, .multiselection = TRUE, .fill = TRUE,
                     .getvalue = table_getvalue, .getstyle = table_getstyle, .onsave = list_save,
--- a/ui/gtk/list.c	Wed Oct 08 22:00:20 2025 +0200
+++ b/ui/gtk/list.c	Thu Oct 09 11:44:10 2025 +0200
@@ -425,6 +425,8 @@
         entry->listview = NULL;
         free(entry->previous_value);
         entry->previous_value = NULL;
+    } else if(GTK_IS_CHECK_BUTTON(child)) {
+        
     }
 }
     
--- a/ui/qt/Makefile	Wed Oct 08 22:00:20 2025 +0200
+++ b/ui/qt/Makefile	Thu Oct 09 11:44:10 2025 +0200
@@ -35,11 +35,10 @@
 
 $(UI_LIB): $(QT_MAKEFILE) $(OBJ) $(UI_LIB) FORCE
 	$(MAKE) -f $(QT_MAKEFILE)
-	$(AR) $(ARFLAGS) $(OBJ) $(UI_LIB) $(OBJ)
+	$(AR) $(ARFLAGS) $(UI_LIB) $(OBJ)
 
-$(UI_SHLIB): $(QT_MAKEFILE) $(OBJ) $(UI_LIB_SH) FORCE
-	$(MAKE) -f $(QT_MAKEFILE)
-	$(CXX) -o $(UI_SHLIB) $(LDFLAGS) $(SHLIB_LDFLAGS) $(TK_LDFLAGS) $(OBJ) -L../build/lib -lucx
-
+$(UI_SHLIB): $(QT_MAKEFILE) $(OBJ) $(UI_LIB_SH) $(UI_LIB) FORCE
+	$(CXX) -o $(UI_SHLIB) $(LDFLAGS) $(SHLIB_LDFLAGS) $(TK_LDFLAGS) $(OBJ) ../build/ui/qt/*.o -L../build/lib -lucx
+	
 FORCE:
 
--- a/ui/qt/qt5.pro	Wed Oct 08 22:00:20 2025 +0200
+++ b/ui/qt/qt5.pro	Thu Oct 09 11:44:10 2025 +0200
@@ -26,7 +26,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-TARGET = uitk_qt
+TARGET = uitk
 TEMPLATE = lib
 CONFIG += staticlib warn_off debug
 DESTDIR = ../build/lib

mercurial