Browse Source

Fix FTBFS in certain packages due to incorrect tqApp mangling

This partially resolves Bug 604
(cherry picked from commit dc60c953d2)
v3.5.13-sru
Timothy Pearson 10 years ago
committed by Slávek Banko
parent
commit
0434eae177
  1. 1
      qtinterface/tqt-replace
  2. 1
      qtinterface/tqt-replace-stream
  3. 1
      qtinterface/tqt-replace-stream.cmake
  4. 1
      qtinterface/tqt-replace.cmake

1
qtinterface/tqt-replace

@ -11,6 +11,7 @@ else
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"
sed -i 's/tqApp/qApp/g' "$1"
sed -i 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' "$1"
sed -i 's/TQ_PROPERTY/Q_PROPERTY/g' "$1"
sed -i 's/TQ_ENUMS/Q_ENUMS/g' "$1"

1
qtinterface/tqt-replace-stream

@ -10,6 +10,7 @@ else
sed 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' | \
sed 's/TQT\([^_]\)/QT\1/g' | \
sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' | \
sed 's/tqApp/qApp/g' | \
sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' | \
sed 's/TQ_PROPERTY/Q_PROPERTY/g' | \
sed 's/TQ_ENUMS/Q_ENUMS/g' | \

1
qtinterface/tqt-replace-stream.cmake

@ -10,6 +10,7 @@ else
sed 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' | \
sed 's/TQT\([^_]\)/QT\1/g' | \
sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' | \
sed 's/tqApp/qApp/g' | \
sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' | \
sed 's/TQ_PROPERTY/Q_PROPERTY/g' | \
sed 's/TQ_ENUMS/Q_ENUMS/g' | \

1
qtinterface/tqt-replace.cmake

@ -11,6 +11,7 @@ else
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"
sed -i 's/tqApp/qApp/g' "$1"
sed -i 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' "$1"
sed -i 's/TQ_PROPERTY/Q_PROPERTY/g' "$1"
sed -i 's/TQ_ENUMS/Q_ENUMS/g' "$1"

Loading…
Cancel
Save