fix qt build

Thu, 11 Dec 2025 21:05:40 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Thu, 11 Dec 2025 21:05:40 +0100
changeset 989
cd1ccc0d3d05
parent 988
bb7718f7d31d
child 990
38a48b756d80

fix qt build

ui/qt/menu.cpp file | annotate | diff | comparison | revisions
ui/qt/qt5.pro file | annotate | diff | comparison | revisions
ui/qt/stock.cpp file | annotate | diff | comparison | revisions
ui/qt/stock.h file | annotate | diff | comparison | revisions
ui/qt/toolbar.cpp file | annotate | diff | comparison | revisions
ui/qt/toolkit.cpp file | annotate | diff | comparison | revisions
--- a/ui/qt/menu.cpp	Thu Dec 11 20:59:13 2025 +0100
+++ b/ui/qt/menu.cpp	Thu Dec 11 21:05:40 2025 +0100
@@ -38,7 +38,6 @@
 #include "../common/menu.h"
 #include "../ui/properties.h"
 #include "../ui/window.h"
-#include "stock.h"
 #include "container.h"
 
 
--- a/ui/qt/qt5.pro	Thu Dec 11 20:59:13 2025 +0100
+++ b/ui/qt/qt5.pro	Thu Dec 11 21:05:40 2025 +0100
@@ -43,7 +43,6 @@
 SOURCES += window.cpp
 SOURCES += menu.cpp
 SOURCES += toolbar.cpp
-SOURCES += stock.cpp
 SOURCES += container.cpp
 SOURCES += text.cpp
 SOURCES += model.cpp
@@ -59,7 +58,6 @@
 HEADERS += window.h
 HEADERS += menu.h
 HEADERS += toolbar.h
-HEADERS += stock.h
 HEADERS += container.h
 HEADERS += text.h
 HEADERS += model.h
--- a/ui/qt/stock.cpp	Thu Dec 11 20:59:13 2025 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2014 Olaf Wintermann. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "stock.h"
-#include "../ui/properties.h"
-
-
-
-
--- a/ui/qt/stock.h	Thu Dec 11 20:59:13 2025 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2014 Olaf Wintermann. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef STOCK_H
-#define	STOCK_H
-
-#include "../ui/stock.h"
-
-
-
-#endif	/* STOCK_H */
-
--- a/ui/qt/toolbar.cpp	Thu Dec 11 20:59:13 2025 +0100
+++ b/ui/qt/toolbar.cpp	Thu Dec 11 21:05:40 2025 +0100
@@ -30,7 +30,6 @@
 
 #include "toolbar.h"
 #include "menu.h"
-#include "stock.h"
 
 static void add_items(UiObject *obj, QToolBar *toolbar, CxList *defaults, CxMap *items);
 static void create_item(UiObject *obj, QToolBar *toolbar, UiToolbarItemI *i);
--- a/ui/qt/toolkit.cpp	Thu Dec 11 20:59:13 2025 +0100
+++ b/ui/qt/toolkit.cpp	Thu Dec 11 21:05:40 2025 +0100
@@ -31,7 +31,6 @@
 
 #include "toolkit.h"
 #include "window.h"
-#include "stock.h"
 
 #include "../common/document.h"
 #include "../common/properties.h"

mercurial