diff options
| -rw-r--r-- | kalyptus/kalyptus | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index be9a3ec..41fb1a6 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -139,7 +139,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); TQM_EXPORT_NETWORK => '', TQM_EXPORT_SQL => '', TQM_EXPORT_WORKSPACE => '', - QT_NO_REMOTE => 'QT_NO_REMOTE', + TQT_NO_REMOTE => 'TQT_NO_REMOTE', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', Q_WS_X11 => 'Q_WS_X11', TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', @@ -268,7 +268,7 @@ else sub { my $s = shift; - $s =~ m/^\#\s*ifndef\s+QT_NO_(?:REMOTE| # not in the default compile options + $s =~ m/^\#\s*ifndef\s+TQT_NO_(?:REMOTE| # not in the default compile options NIS| # ... XINERAMA| IMAGEIO_(?:MNG|JPEG)| @@ -578,7 +578,7 @@ LOOP: if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or $p =~ m/^#\s*if\s+defined\(Q_WS_/ or ($p =~ m/^#\s*ifdef\s+_WS_QWS_/ and $qt_embedded) or - ($p =~ m/^#\s*ifndef\s+QT_NO_MIMECLIPBOARD/ and $qt_embedded) or + ($p =~ m/^#\s*ifndef\s+TQT_NO_MIMECLIPBOARD/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(_WS_X11_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(Q_WS_X11_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or @@ -598,7 +598,7 @@ LOOP: $p =~ m/^#\s*ifdef\s+Q_MOC_RUN/ or $p =~ m/^#\s*if\s+defined\s*\(QT3_SUPPORT/ or $p =~ m/^#\s*if\s+defined\s*\(qdoc/ or - $p =~ m/^#\s*ifndef\s+QT_NO_MEMBER_TEMPLATES/ or + $p =~ m/^#\s*ifndef\s+TQT_NO_MEMBER_TEMPLATES/ or $p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or &$match_qt_defines( $p ) or $p =~ m/^#\s*if\s+0\s+/ ) { @@ -608,7 +608,7 @@ LOOP: last if !defined $p; $if_depth++ if $p =~ m/^#\s*if/; $if_depth-- if $p =~ m/^#\s*endif/; - # Exit at #else in the #ifdef QT_NO_ACCEL/#else/#endif case + # Exit at #else in the #ifdef TQT_NO_ACCEL/#else/#endif case last if $if_depth == 1 && $p =~ m/^#\s*else\s/; #ignore elif for now print "Skipping ifdef'ed line: $p" if $debug; |