diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-29 19:56:26 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-29 19:56:26 +0000 |
| commit | 8e81621f38427742c4325e5b2022ad12fe612d41 (patch) | |
| tree | 564b23e02d28479a9d563f90ce9d1d8edee5122c | |
| parent | c0a0dbb535084b971cdc88299d0949aaed4d8a1f (diff) | |
| download | tqtinterface-8e81621f38427742c4325e5b2022ad12fe612d41.tar.gz tqtinterface-8e81621f38427742c4325e5b2022ad12fe612d41.zip | |
Fix TQt3-based FTBFS in a handful of modules
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1250203 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rwxr-xr-x | qtinterface/tqt-replace | 1 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream | 3 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace-stream.cmake | 3 | ||||
| -rwxr-xr-x | qtinterface/tqt-replace.cmake | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace index 914732f..260e38e 100755 --- a/qtinterface/tqt-replace +++ b/qtinterface/tqt-replace @@ -17,6 +17,7 @@ else sed -i 's/TQ_SETS/Q_SETS/g' "$1" sed -i 's/TQ_OVERRIDE/Q_OVERRIDE/g' "$1" sed -i 's/TQ_CLASSINFO/Q_CLASSINFO/g' "$1" + sed -i 's/Qt::Orientation::Orientation/g' "$1" exit 0 fi diff --git a/qtinterface/tqt-replace-stream b/qtinterface/tqt-replace-stream index 261146a..f017ed2 100755 --- a/qtinterface/tqt-replace-stream +++ b/qtinterface/tqt-replace-stream @@ -15,7 +15,8 @@ else sed 's/TQ_ENUMS/Q_ENUMS/g' | \ sed 's/TQ_SETS/Q_SETS/g' | \ sed 's/TQ_OVERRIDE/Q_OVERRIDE/g' | \ - sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' + sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' | \ + sed 's/Qt::Orientation::Orientation/g' fi if [[ $QT_VER == 4 ]]; then diff --git a/qtinterface/tqt-replace-stream.cmake b/qtinterface/tqt-replace-stream.cmake index 84c1083..69b2dd5 100755 --- a/qtinterface/tqt-replace-stream.cmake +++ b/qtinterface/tqt-replace-stream.cmake @@ -15,7 +15,8 @@ else sed 's/TQ_ENUMS/Q_ENUMS/g' | \ sed 's/TQ_SETS/Q_SETS/g' | \ sed 's/TQ_OVERRIDE/Q_OVERRIDE/g' | \ - sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' + sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' | \ + sed 's/Qt::Orientation::Orientation/g' fi if [[ $QT_VERSION == 4 ]]; then diff --git a/qtinterface/tqt-replace.cmake b/qtinterface/tqt-replace.cmake index 97ace27..07e1ca1 100755 --- a/qtinterface/tqt-replace.cmake +++ b/qtinterface/tqt-replace.cmake @@ -11,12 +11,13 @@ 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 sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/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" sed -i 's/TQ_SETS/Q_SETS/g' "$1" sed -i 's/TQ_OVERRIDE/Q_OVERRIDE/g' "$1" sed -i 's/TQ_CLASSINFO/Q_CLASSINFO/g' "$1" + sed -i 's/Qt::Orientation::Orientation/g' "$1" exit 0 fi |