summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in.in4
-rw-r--r--doc/man/Makefile.am23
-rw-r--r--kjsembed/docs/embedding/qtembed/posviewbase.ui6
-rw-r--r--kjsembed/docs/embedding/simple-embed/embedview.ui3
-rw-r--r--kjsembed/docs/examples/imunge/resizeparams.ui6
-rw-r--r--kjsembed/docs/examples/madminute/configdialog.ui6
-rw-r--r--kjsembed/docs/examples/madminute/madminute.ui3
-rw-r--r--kjsembed/docs/examples/qdocviewer/docviewer.ui6
-rw-r--r--kjsembed/tdescript/swaptabs.ui6
-rw-r--r--korundum/configure.in.in3
-rw-r--r--qtruby/configure.in.in3
-rw-r--r--qtruby/rubylib/designer/examples/colortool/mainform.ui15
-rw-r--r--qtsharp/src/uicsharp/tests/form5.ui15
-rw-r--r--qtsharp/src/uicsharp/tests/form6.ui6
-rw-r--r--qtsharp/src/uicsharp/tests/form9.ui6
15 files changed, 30 insertions, 81 deletions
diff --git a/configure.in.in b/configure.in.in
index ae82a862..d9367d31 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -195,7 +195,11 @@ AC_DEFUN([KDE_CHECK_JAVA],
AC_REQUIRE([KDE_CHECK_JAVA_DIR])
if test "$kde_java_bindir" = "no"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE $1";
+ BUILD_$1=false
+ else
+ BUILD_$1=true
fi
+ AM_CONDITIONAL(BUILD_$1, ${BUILD_$1})
]
)
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index ad36d631..1f739ad7 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,21 @@
+if BUILD_dcopjava
+ DCOPJAVA_MAN=dcopidl2java.1
+endif
+
+KJSEMBED_MAN=kjscmd.1
+
+if BUILD_korundum
+ KORUNDUM_MAN=krubyinit.1 rbtdeapi.1 rbtdesh.1
+endif
+
+if BUILD_qtjava
+ QTJAVA_MAN=juic.1
+endif
+
+if BUILD_qtruby
+ QTRUBY_MAN=qtrubyinit.1 rbqtapi.1 rbqtsh.1 rbuic.1
+endif
+
tmpdir = $(mandir)/man1
-tmp_DATA = dcopidl2java.1 juic.1 kjscmd.1 krubyinit.1 qtrubyinit.1 \
-rbqtapi.1 rbqtsh.1 rbtdeapi.1 rbtdesh.1 rbuic.1
-EXTRA_DIST=$(tmp_DATA)
+tmp_DATA = $(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN)
+EXTRA_DIST=$(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN)
diff --git a/kjsembed/docs/embedding/qtembed/posviewbase.ui b/kjsembed/docs/embedding/qtembed/posviewbase.ui
index 4916d505..6c55b01e 100644
--- a/kjsembed/docs/embedding/qtembed/posviewbase.ui
+++ b/kjsembed/docs/embedding/qtembed/posviewbase.ui
@@ -137,9 +137,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -154,9 +151,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/kjsembed/docs/embedding/simple-embed/embedview.ui b/kjsembed/docs/embedding/simple-embed/embedview.ui
index 7f9e0aff..58c75064 100644
--- a/kjsembed/docs/embedding/simple-embed/embedview.ui
+++ b/kjsembed/docs/embedding/simple-embed/embedview.ui
@@ -96,9 +96,6 @@
<property name="text">
<string>Console</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="stdItem" stdset="0">
<number>0</number>
</property>
diff --git a/kjsembed/docs/examples/imunge/resizeparams.ui b/kjsembed/docs/examples/imunge/resizeparams.ui
index 9f8f4a86..ec0cecf3 100644
--- a/kjsembed/docs/examples/imunge/resizeparams.ui
+++ b/kjsembed/docs/examples/imunge/resizeparams.ui
@@ -141,9 +141,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -158,9 +155,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/kjsembed/docs/examples/madminute/configdialog.ui b/kjsembed/docs/examples/madminute/configdialog.ui
index 5cb1d832..8e7e6de5 100644
--- a/kjsembed/docs/examples/madminute/configdialog.ui
+++ b/kjsembed/docs/examples/madminute/configdialog.ui
@@ -176,9 +176,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -193,9 +190,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/kjsembed/docs/examples/madminute/madminute.ui b/kjsembed/docs/examples/madminute/madminute.ui
index 1154312a..e9c84652 100644
--- a/kjsembed/docs/examples/madminute/madminute.ui
+++ b/kjsembed/docs/examples/madminute/madminute.ui
@@ -321,9 +321,6 @@
<property name="menuText">
<string>&amp;About</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
diff --git a/kjsembed/docs/examples/qdocviewer/docviewer.ui b/kjsembed/docs/examples/qdocviewer/docviewer.ui
index 94b7458b..b9bb38d7 100644
--- a/kjsembed/docs/examples/qdocviewer/docviewer.ui
+++ b/kjsembed/docs/examples/qdocviewer/docviewer.ui
@@ -414,9 +414,6 @@
<property name="menuText">
<string>E&amp;xit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -479,9 +476,6 @@
<property name="menuText">
<string>&amp;About</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
</actions>
<images>
diff --git a/kjsembed/tdescript/swaptabs.ui b/kjsembed/tdescript/swaptabs.ui
index f7f5e973..d9f9a4d8 100644
--- a/kjsembed/tdescript/swaptabs.ui
+++ b/kjsembed/tdescript/swaptabs.ui
@@ -126,9 +126,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -143,9 +140,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/korundum/configure.in.in b/korundum/configure.in.in
index c420adc9..f32e1473 100644
--- a/korundum/configure.in.in
+++ b/korundum/configure.in.in
@@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
if test -z "RUBY_EXECUTABLE"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
+ BUILD_korundum=false
else
RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
@@ -87,4 +88,6 @@ else
AC_SUBST(RUBY_INCLUDEDIR)
AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS)
+ BUILD_korundum=true
fi
+AM_CONDITIONAL(BUILD_korundum, $BUILD_korundum)
diff --git a/qtruby/configure.in.in b/qtruby/configure.in.in
index 84ad88ec..bc32a89d 100644
--- a/qtruby/configure.in.in
+++ b/qtruby/configure.in.in
@@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
if test -z "RUBY_EXECUTABLE"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
+ BUILD_qtruby=false
else
RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
@@ -87,4 +88,6 @@ else
AC_SUBST(RUBY_INCLUDEDIR)
AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS)
+ BUILD_qtruby=true
fi
+AM_CONDITIONAL(BUILD_qtruby, $BUILD_qtruby)
diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui b/qtruby/rubylib/designer/examples/colortool/mainform.ui
index f4081882..340b6c31 100644
--- a/qtruby/rubylib/designer/examples/colortool/mainform.ui
+++ b/qtruby/rubylib/designer/examples/colortool/mainform.ui
@@ -215,9 +215,6 @@
<property name="menuText">
<string>Save &amp;As...</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -229,9 +226,6 @@
<property name="menuText">
<string>E&amp;xit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -294,9 +288,6 @@
<property name="menuText">
<string>&amp;Contents...</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -308,9 +299,6 @@
<property name="menuText">
<string>&amp;Index...</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -322,9 +310,6 @@
<property name="menuText">
<string>&amp;About</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
diff --git a/qtsharp/src/uicsharp/tests/form5.ui b/qtsharp/src/uicsharp/tests/form5.ui
index bb998334..46308250 100644
--- a/qtsharp/src/uicsharp/tests/form5.ui
+++ b/qtsharp/src/uicsharp/tests/form5.ui
@@ -125,9 +125,6 @@
<property name="menuText">
<string>Save &amp;As...</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -156,9 +153,6 @@
<property name="menuText">
<string>E&amp;xit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -272,9 +266,6 @@
<property name="menuText">
<string>&amp;Contents...</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -286,9 +277,6 @@
<property name="menuText">
<string>&amp;Index...</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
@@ -300,9 +288,6 @@
<property name="menuText">
<string>&amp;About</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
</actions>
<images>
diff --git a/qtsharp/src/uicsharp/tests/form6.ui b/qtsharp/src/uicsharp/tests/form6.ui
index bcc04572..f97aa87e 100644
--- a/qtsharp/src/uicsharp/tests/form6.ui
+++ b/qtsharp/src/uicsharp/tests/form6.ui
@@ -85,9 +85,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -102,9 +99,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
diff --git a/qtsharp/src/uicsharp/tests/form9.ui b/qtsharp/src/uicsharp/tests/form9.ui
index 3ba562c7..33c6e5f3 100644
--- a/qtsharp/src/uicsharp/tests/form9.ui
+++ b/qtsharp/src/uicsharp/tests/form9.ui
@@ -165,9 +165,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -182,9 +179,6 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>