diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /libkdenetwork | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdenetwork')
| -rw-r--r-- | libkdenetwork/gpgmepp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libkdenetwork/qgpgme/dataprovider.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libkdenetwork/gpgmepp/CMakeLists.txt b/libkdenetwork/gpgmepp/CMakeLists.txt index 7fe95668a..32ee0ca8c 100644 --- a/libkdenetwork/gpgmepp/CMakeLists.txt +++ b/libkdenetwork/gpgmepp/CMakeLists.txt @@ -49,6 +49,6 @@ tde_add_library( gpgme++ SHARED verificationresult.cpp signingresult.cpp encryptionresult.cpp engineinfo.cpp VERSION 0.4.0 - LINK ${GPGME_LIBRARIES} + LINK ${TQT_LIBRARIES} ${GPGME_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkdenetwork/qgpgme/dataprovider.cpp b/libkdenetwork/qgpgme/dataprovider.cpp index a37684d0d..052b84c48 100644 --- a/libkdenetwork/qgpgme/dataprovider.cpp +++ b/libkdenetwork/qgpgme/dataprovider.cpp @@ -30,7 +30,7 @@ static bool resizeAndInit( TQByteArray & ba, size_t newSize ) { const size_t oldSize = ba.size(); - bool ok = ba.resize( newSize ); + bool ok = ba.tqresize( newSize ); if ( ok ) memset( ba.data() + oldSize, 0, newSize - oldSize ); return ok; |