summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xqtinterface/tqt-replace-stream3
-rwxr-xr-xqtinterface/tqt-replace-stream.cmake3
-rwxr-xr-xqtinterface/tqt-replace.cmake1
3 files changed, 5 insertions, 2 deletions
diff --git a/qtinterface/tqt-replace-stream b/qtinterface/tqt-replace-stream
index 68c8a22..bcf608d 100755
--- a/qtinterface/tqt-replace-stream
+++ b/qtinterface/tqt-replace-stream
@@ -7,7 +7,8 @@ else
if [[ $QT_VER == 3 ]]; then
cat $1 | \
sed 's/TQ\([^T]\)/Q\1/g' | \
- sed 's/TQT\([^_]\)/QT\1/g'
+ sed 's/TQT\([^_]\)/QT\1/g' | \
+ sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g'
fi
if [[ $QT_VER == 4 ]]; then
diff --git a/qtinterface/tqt-replace-stream.cmake b/qtinterface/tqt-replace-stream.cmake
index 6f5f352..49b6d73 100755
--- a/qtinterface/tqt-replace-stream.cmake
+++ b/qtinterface/tqt-replace-stream.cmake
@@ -7,7 +7,8 @@ else
if [[ $QT_VERSION == 3 ]]; then
cat $1 | \
sed 's/TQ\([^T]\)/Q\1/g' | \
- sed 's/TQT\([^_]\)/QT\1/g'
+ sed 's/TQT\([^_]\)/QT\1/g' | \
+ sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g'
fi
if [[ $QT_VERSION == 4 ]]; then
diff --git a/qtinterface/tqt-replace.cmake b/qtinterface/tqt-replace.cmake
index 7f28f05..3c5cb2a 100755
--- a/qtinterface/tqt-replace.cmake
+++ b/qtinterface/tqt-replace.cmake
@@ -9,6 +9,7 @@ else
sed -i 's/TQT\([^_]\)/QT\1/g' "$1"
sed -i 's/Q_SLOTS>/slots>/g' "$1"
sed -i 's/Q_SIGNALS>/signals>/g' "$1"
+ sed -i 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' "$1"
exit 0
fi