diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-19 01:00:13 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-12 04:21:56 +0200 |
| commit | 0434eae1773c1aa1aefe1e1e8092b4bb8ea863b4 (patch) | |
| tree | ca0c80b03402115d4504121c06636e64587c5082 | |
| parent | f9d9c89a92285f952875c14602f48b1556f27da4 (diff) | |
| download | tqtinterface-0434eae1773c1aa1aefe1e1e8092b4bb8ea863b4.tar.gz tqtinterface-0434eae1773c1aa1aefe1e1e8092b4bb8ea863b4.zip | |
Fix FTBFS in certain packages due to incorrect tqApp mangling
This partially resolves Bug 604
(cherry picked from commit dc60c953d272cb104936c9c056b3101975f52ea8)
| -rwxr-xr-x | qtinterface/tqt-replace | 1 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream | 1 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream.cmake | 1 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace.cmake | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace index ee1f016..5afceb4 100755 --- a/qtinterface/tqt-replace +++ b/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" diff --git a/qtinterface/tqt-replace-stream b/qtinterface/tqt-replace-stream index 418715f..4cda1ca 100755 --- a/qtinterface/tqt-replace-stream +++ b/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' | \ diff --git a/qtinterface/tqt-replace-stream.cmake b/qtinterface/tqt-replace-stream.cmake index 5bdbf12..0d24627 100755 --- a/qtinterface/tqt-replace-stream.cmake +++ b/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' | \ diff --git a/qtinterface/tqt-replace.cmake b/qtinterface/tqt-replace.cmake index 193510e..6123a92 100755 --- a/qtinterface/tqt-replace.cmake +++ b/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" |