diff options
12 files changed, 15 insertions, 27 deletions
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install b/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install index 3d417c615..903dc5046 100644 --- a/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -2,7 +2,7 @@ usr/include/tqt3/private/* usr/include/tqt3/tqaccel.h usr/include/tqt3/tqaccessible.h usr/include/tqt3/tqaction.h -usr/include/tqt3/ntqapplication.h +usr/include/tqt3/tqapplication.h usr/include/tqt3/tqasciicache.h usr/include/tqt3/tqasciidict.h usr/include/tqt3/tqasyncimageio.h diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install index 6ef3618a7..d2904e511 100644 --- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -4,8 +4,8 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc -usr/include/tqt3/ntqconfig.h +usr/include/tqt3/tqconfig.h usr/include/tqt3/tqgl.h usr/include/tqt3/tqglcolormap.h -usr/include/tqt3/ntqmodules.h +usr/include/tqt3/tqmodules.h usr/include/tqt3/tqwidgetfactory.h diff --git a/debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh b/debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh index f62d83b85..ed29d712b 100644 --- a/debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh +++ b/debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh @@ -7,7 +7,7 @@ export QTDIR=/usr/share/tqt3 cp /usr/share/tqt3/.qmake.cache ./.qmake.cache # Now compile the examples. The themes example -# won't work since ntqconfig.h is not really correct with the +# won't work since tqconfig.h is not really correct with the # ifdef's for the TQT_NO_xyz_STYLE, so we use make -k to continue cd examples; qmake -o Makefile examples.pro; make -k diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules index db4ee02c0..cb73bd445 100755 --- a/debian/_base/dependencies/tqt3/debian/rules +++ b/debian/_base/dependencies/tqt3/debian/rules @@ -218,7 +218,7 @@ clean:: -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ config.status bin/tqmoc bin/tqmake src/tqmoc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ - src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \ + src/tools/qconfig.cpp plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \ diff --git a/dilos/dependencies/tqt3/debian/libtqt3-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-headers.install index 3d417c615..903dc5046 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-headers.install +++ b/dilos/dependencies/tqt3/debian/libtqt3-headers.install @@ -2,7 +2,7 @@ usr/include/tqt3/private/* usr/include/tqt3/tqaccel.h usr/include/tqt3/tqaccessible.h usr/include/tqt3/tqaction.h -usr/include/tqt3/ntqapplication.h +usr/include/tqt3/tqapplication.h usr/include/tqt3/tqasciicache.h usr/include/tqt3/tqasciidict.h usr/include/tqt3/tqasyncimageio.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.install b/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.install index ae63ed99c..d2904e511 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -4,6 +4,8 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc +usr/include/tqt3/tqconfig.h usr/include/tqt3/tqgl.h usr/include/tqt3/tqglcolormap.h +usr/include/tqt3/tqmodules.h usr/include/tqt3/tqwidgetfactory.h diff --git a/dilos/dependencies/tqt3/debian/maintain/build-examples.sh b/dilos/dependencies/tqt3/debian/maintain/build-examples.sh index f62d83b85..ed29d712b 100644 --- a/dilos/dependencies/tqt3/debian/maintain/build-examples.sh +++ b/dilos/dependencies/tqt3/debian/maintain/build-examples.sh @@ -7,7 +7,7 @@ export QTDIR=/usr/share/tqt3 cp /usr/share/tqt3/.qmake.cache ./.qmake.cache # Now compile the examples. The themes example -# won't work since ntqconfig.h is not really correct with the +# won't work since tqconfig.h is not really correct with the # ifdef's for the TQT_NO_xyz_STYLE, so we use make -k to continue cd examples; qmake -o Makefile examples.pro; make -k diff --git a/dilos/dependencies/tqt3/debian/rules b/dilos/dependencies/tqt3/debian/rules index 259250f64..a6fc3e9d3 100755 --- a/dilos/dependencies/tqt3/debian/rules +++ b/dilos/dependencies/tqt3/debian/rules @@ -168,11 +168,6 @@ libqt-thread-stamp: post-patches echo yes | ./configure $(CONFIGURE_OPTS) - rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h - ln -s ../src/kernel/ntqinputcontext.h include/ntqinputcontext.h - ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory.h - ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h - # proceed $(MAKE) sub-src sub-plugins sub-tools $(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target @@ -192,14 +187,6 @@ libqt-thread-stamp: post-patches install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache - # install ntqconfig.h for the mt - install -m 644 -D include/ntqconfig.h $(P_QTMTDEV)/usr/include/tqt3/ntqconfig.h - install -m 644 -D include/ntqmodules.h $(P_QTMTDEV)/usr/include/tqt3/ntqmodules.h - - install -m 644 -D include/ntqinputcontext.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontext.h - install -m 644 -D include/ntqinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextfactory.h - install -m 644 -D include/ntqinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextplugin.h - touch libqt-thread-stamp clean:: @@ -223,14 +210,13 @@ clean:: -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ config.status bin/tqmoc bin/tqmake src/tqmoc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ - src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \ + src/tools/qconfig.cpp plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \ extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer rm -f qmake/*o - rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install index 3d417c615..903dc5046 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -2,7 +2,7 @@ usr/include/tqt3/private/* usr/include/tqt3/tqaccel.h usr/include/tqt3/tqaccessible.h usr/include/tqt3/tqaction.h -usr/include/tqt3/ntqapplication.h +usr/include/tqt3/tqapplication.h usr/include/tqt3/tqasciicache.h usr/include/tqt3/tqasciidict.h usr/include/tqt3/tqasyncimageio.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install index 6ef3618a7..d2904e511 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -4,8 +4,8 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc -usr/include/tqt3/ntqconfig.h +usr/include/tqt3/tqconfig.h usr/include/tqt3/tqgl.h usr/include/tqt3/tqglcolormap.h -usr/include/tqt3/ntqmodules.h +usr/include/tqt3/tqmodules.h usr/include/tqt3/tqwidgetfactory.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/build-examples.sh b/ubuntu/_base/dependencies/tqt3/debian/maintain/build-examples.sh index f62d83b85..ed29d712b 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/maintain/build-examples.sh +++ b/ubuntu/_base/dependencies/tqt3/debian/maintain/build-examples.sh @@ -7,7 +7,7 @@ export QTDIR=/usr/share/tqt3 cp /usr/share/tqt3/.qmake.cache ./.qmake.cache # Now compile the examples. The themes example -# won't work since ntqconfig.h is not really correct with the +# won't work since tqconfig.h is not really correct with the # ifdef's for the TQT_NO_xyz_STYLE, so we use make -k to continue cd examples; qmake -o Makefile examples.pro; make -k diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index db4ee02c0..cb73bd445 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -218,7 +218,7 @@ clean:: -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ config.status bin/tqmoc bin/tqmake src/tqmoc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ - src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \ + src/tools/qconfig.cpp plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \ |