[prev in list] [next in list] [prev in thread] [next in thread]
List: kdevelop-devel
Subject: Re: Hmm - here's a possible problem (Re: class libs/widget/KTabBar conflicts with class kdelibs/kdeu
From: jbb <jbb () kdevelop ! org>
Date: 2003-10-18 23:53:09
[Download RAW message or body]
On Thu, 16 Oct 2003 19:58, jbb wrote:
> On Thu, 16 Oct 2003 11:38, Amilcar do Carmo Lucas wrote:
> > The patch breaks KDE 3.1.3.
> > Everything compiles fine, but in linking src/kdevelop I get an error in
> > mainwindowideal.cpp:228 because the code for ktabwidget class is not
> > linked with.
>
> Sigh - what is the compat lib for? Only for kde versions < 3.1? Do we have
> a lib (besides qextmdi) for kde < 3.1.90 somewhere?
Right - lets split this into two parts then.
This patch fixes just the compat issue. Works on kde-cvs. Please try on kde3.1
and kde3.0. I'll commit when I get confirmation that it works.
jbb
["kdevelop.patch" (text/x-diff)]
? build_compiled
? build_configured
? build_done
? build_initialised
Index: kdevelop.m4.in
===================================================================
RCS file: /home/kde/kdevelop/kdevelop.m4.in,v
retrieving revision 1.30
diff -u -r1.30 kdevelop.m4.in
--- kdevelop.m4.in 10 Oct 2003 00:47:27 -0000 1.30
+++ kdevelop.m4.in 18 Oct 2003 23:37:47 -0000
@@ -555,12 +555,21 @@
if test "$ac_cv_qt31_setup" = "yes"; then
AC_MSG_RESULT(no)
+ KDEVCOMPAT=""
+ LIB_KDEVCOMPAT=""
+ KDEVCOMPAT_INCLUDES=""
else
AC_MSG_RESULT(yes)
- COMPAT=compat
+ KDEVCOMPAT=compat
+ LIB_KDEVCOMPAT="$(top_builddir)/lib/compat/libkdevcompat.la"
+ KDEVCOMPAT_INCLUDES="'-I$(top_srcdir)/lib/compat'"
+ AC_MSG_RESULT(yes)
fi
-AC_SUBST(COMPAT)
-AM_CONDITIONAL(include_compat, test -n "$COMPAT")
+
+ AC_SUBST(KDEVCOMPAT)
+ AC_SUBST(LIB_KDEVCOMPAT)
+ AC_SUBST(KDEVCOMPAT_INCLUDES)
+ AM_CONDITIONAL(include_compat, test -n "$KDEVCOMPAT")
])
dnl **********
Index: languages/cpp/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/languages/cpp/Makefile.am,v
retrieving revision 1.74
diff -u -r1.74 Makefile.am
--- languages/cpp/Makefile.am 13 Oct 2003 10:10:57 -0000 1.74
+++ languages/cpp/Makefile.am 18 Oct 2003 23:37:52 -0000
@@ -2,7 +2,7 @@
SUBDIRS = templates subclassing_template newclass_templates file_templates \
app_templates compiler pcsimporter debugger doc
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/compat \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/catalog -I$(top_srcdir)/lib/cppparser \
$(all_includes) +INCLUDES = -I$(top_srcdir)/lib/interfaces $(KDEVCOMPAT_INCLUDES) \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/catalog -I$(top_srcdir)/lib/cppparser \
$(all_includes)
kde_module_LTLIBRARIES = libkdevcppsupport.la
libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
Index: languages/java/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/languages/java/Makefile.am,v
retrieving revision 1.32
diff -u -r1.32 Makefile.am
--- languages/java/Makefile.am 13 Oct 2003 10:10:57 -0000 1.32
+++ languages/java/Makefile.am 18 Oct 2003 23:37:57 -0000
@@ -5,7 +5,7 @@
# SUBDIRS = templates subclassing_template newclass_templates file_templates
SUBDIRS = file_templates app_templates debugger doc
-INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/interfaces \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/catalog -I$(top_srcdir)/lib/compat \
$(all_includes) +INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/interfaces \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/catalog $(KDEVCOMPAT_INCLUDES) \
$(all_includes)
kde_module_LTLIBRARIES = libkdevjavasupport.la
libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
Index: languages/sql/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/languages/sql/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- languages/sql/Makefile.am 13 Oct 2003 10:10:57 -0000 1.4
+++ languages/sql/Makefile.am 18 Oct 2003 23:38:00 -0000
@@ -1,6 +1,6 @@
#Here resides the SQL support part.
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/compat $(all_includes) +INCLUDES \
= -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo \
-I$(top_srcdir)/lib/util $(KDEVCOMPAT_INCLUDES) $(all_includes) SUBDIRS = \
app_templates doc
kde_module_LTLIBRARIES = libkdevsqlsupport.la
Index: lib/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/Makefile.am,v
retrieving revision 1.31
diff -u -r1.31 Makefile.am
--- lib/Makefile.am 13 Sep 2003 17:41:57 -0000 1.31
+++ lib/Makefile.am 18 Oct 2003 23:38:00 -0000
@@ -10,7 +10,6 @@
if include_compat
COMPAT_SUBDIR=compat
-LIB_KDEVCOMPAT=$(top_builddir)/lib/compat/libkdevcompat.la
endif
lib_LTLIBRARIES = libkdevelop.la
Index: lib/util/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/util/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- lib/util/Makefile.am 8 Oct 2003 13:02:02 -0000 1.14
+++ lib/util/Makefile.am 18 Oct 2003 23:38:03 -0000
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \
-I$(top_srcdir)/lib/sourceinfo $(all_includes) +INCLUDES = $(KDEVCOMPAT_INCLUDES) \
-I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo $(all_includes)
noinst_LTLIBRARIES = libkdevutil.la
Index: lib/widgets/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/widgets/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- lib/widgets/Makefile.am 9 Oct 2003 10:46:03 -0000 1.17
+++ lib/widgets/Makefile.am 18 Oct 2003 23:38:03 -0000
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/lib/compat $(all_includes)
+INCLUDES = $(KDEVCOMPAT_INCLUDES) $(all_includes)
METASOURCES = AUTO
Index: lib/widgets/propeditor/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/widgets/propeditor/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- lib/widgets/propeditor/Makefile.am 9 Oct 2003 10:46:03 -0000 1.4
+++ lib/widgets/propeditor/Makefile.am 18 Oct 2003 23:38:03 -0000
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/lib/compat $(all_includes)
+INCLUDES = $(KDEVCOMPAT_INCLUDES) $(all_includes)
METASOURCES = AUTO
lib_LTLIBRARIES = libpropertyeditor.la
Index: parts/classview/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/parts/classview/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- parts/classview/Makefile.am 7 Aug 2003 18:51:08 -0000 1.10
+++ parts/classview/Makefile.am 18 Oct 2003 23:38:05 -0000
@@ -1,6 +1,6 @@
# Here resides the class view part.
-INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) +INCLUDES = \
$(KDEVCOMPAT_INCLUDES) -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-I$(top_srcdir)/lib/widgets $(all_includes)
kde_module_LTLIBRARIES = libkdevclassview.la
libkdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
Index: parts/fileview/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/parts/fileview/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- parts/fileview/Makefile.am 18 Oct 2003 15:02:59 -0000 1.13
+++ parts/fileview/Makefile.am 18 Oct 2003 23:38:07 -0000
@@ -1,6 +1,6 @@
# Here resides the file view part.
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/compat \
-I$(top_srcdir)/lib/sourceinfo -I$(top_srcdir)/lib/util $(all_includes) +INCLUDES = \
-I$(top_srcdir)/lib/interfaces $(KDEVCOMPAT_INCLUDES) -I$(top_srcdir)/lib/sourceinfo \
-I$(top_srcdir)/lib/util $(all_includes)
kde_module_LTLIBRARIES = libkdevfileview.la libkdevfilegroups.la
Index: src/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/src/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- src/Makefile.am 2 Oct 2003 15:22:03 -0000 1.38
+++ src/Makefile.am 18 Oct 2003 23:38:10 -0000
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-I$(top_srcdir)/lib $(KDEVMDI_INCLUDES) -I$(top_srcdir)/lib/structure $(all_includes) \
+INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-I$(top_srcdir)/lib $(KDEVMDI_INCLUDES) -I$(top_srcdir)/lib/structure \
-I$(top_srcdir)/lib/widgets $(all_includes)
bin_PROGRAMS = kdevelop
Index: src/mainwindowideal.cpp
===================================================================
RCS file: /home/kde/kdevelop/src/mainwindowideal.cpp,v
retrieving revision 1.45
diff -u -r1.45 mainwindowideal.cpp
--- src/mainwindowideal.cpp 2 Oct 2003 15:22:03 -0000 1.45
+++ src/mainwindowideal.cpp 18 Oct 2003 23:38:15 -0000
@@ -44,8 +44,8 @@
#include <kedittoolbar.h>
-#include "widgets/ktabzoomwidget.h"
-#include "widgets/ktabwidget.h"
+#include "ktabzoomwidget.h"
+#include "ktabwidget.h"
#include "kdevplugin.h"
Index: src/mainwindowideal.h
===================================================================
RCS file: /home/kde/kdevelop/src/mainwindowideal.h,v
retrieving revision 1.15
diff -u -r1.15 mainwindowideal.h
--- src/mainwindowideal.h 30 Jul 2003 15:50:42 -0000 1.15
+++ src/mainwindowideal.h 18 Oct 2003 23:38:16 -0000
@@ -18,7 +18,7 @@
#define _MAINWINDOWIDEAL_H_
-#include "widgets/ktabwidget.h"
+#include "ktabwidget.h"
#include <kparts/mainwindow.h>
Index: vcs/cvs/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/vcs/cvs/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- vcs/cvs/Makefile.am 8 Oct 2003 13:02:02 -0000 1.21
+++ vcs/cvs/Makefile.am 18 Oct 2003 23:38:17 -0000
@@ -1,6 +1,6 @@
# Here resides the cvs part
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/compat \
-I$(top_srcdir)/lib/util $(all_includes) +INCLUDES = -I$(top_srcdir)/lib/interfaces \
$(KDEVCOMPAT_INCLUDES) -I$(top_srcdir)/lib/util $(all_includes)
kde_module_LTLIBRARIES = libkdevcvs.la
libkdevcvs_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
_______________________________________________
Kdevelop-devel mailing list
Kdevelop-devel@barney.cs.uni-potsdam.de
http://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic