diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 22:00:40 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 22:00:40 -0600 |
commit | 4557744068049916272a5e2edf304b59e95ca8a7 (patch) | |
tree | 1ee17348c29a779d642b894f68efb1b2f5543508 /libreoffice/3.6.0/patches | |
parent | 9ad40fa87ef0008bdf586a390c1fb7638161dac5 (diff) | |
download | thirdparty-4557744068049916272a5e2edf304b59e95ca8a7.tar.gz thirdparty-4557744068049916272a5e2edf304b59e95ca8a7.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/3.6.0/patches')
-rw-r--r-- | libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff b/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff index a3335de..92138ba 100644 --- a/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff +++ b/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff @@ -339,9 +339,9 @@ } +#ifdef ENABLE_TDE -+void KDEFileDialog::fileHighlightedCommand( const TQString & ) ++void TDEFileDialog::fileHighlightedCommand( const TQString & ) +#else // ENABLE_TDE - void KDEFileDialog::fileHighlightedCommand( const QString & ) + void TDEFileDialog::fileHighlightedCommand( const QString & ) +#endif // ENABLE_TDE { if ( canNotifySelection() ) |