diff options
| author |  Robert Förster | 2014-06-01 09:49:28 +0000 |
|---|---|---|
| committer | Robert Förster | 2014-06-01 09:49:28 +0000 |
| commit | e3ecdd9668a23916f6820caafa79291ed842601a (patch) | |
| tree | 563b7dcadce7a777531cd4174dc1d46a5c3ed6ca /src/modules/objects | |
| parent | Patch for a perl weirdness in a macro spaghetti that worksaround the error: (diff) | |
| download | KVIrc-e3ecdd9668a23916f6820caafa79291ed842601a.tar.gz KVIrc-e3ecdd9668a23916f6820caafa79291ed842601a.tar.bz2 KVIrc-e3ecdd9668a23916f6820caafa79291ed842601a.zip | |
- added qt5 phonon support (windows doesn't seem to work, others were not tested yet)
- fixed tabs in plist
- wrapped #warning into __GNUC__ ifdef
- partly revert r6370 the change was quite pointless
- update to ExtUtils::ParseXS 3.24 and Devel::PPPort 3.24, also adding a define which the latter suggested
- massive update to the numeric table, no function change, some of these make sense to implement, some don't, this commit is merely to complete the listing so i can figure something out, possibly
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6381 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/KvsObject_ftp.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/KvsObject_http.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp index e23daa0bd..f9ed6c7b9 100644 --- a/src/modules/objects/KvsObject_ftp.cpp +++ b/src/modules/objects/KvsObject_ftp.cpp @@ -24,7 +24,9 @@ #include "KvsObject_ftp.h" -#warning QFtp doesn't exists anymore in Qt5, port this class or drop it +#ifdef __GNUC__ +#warning QFtp doesn't exist anymore in Qt5, port this class or drop it +#endif #if (QT_VERSION < 0x050000) #include "kvi_debug.h" diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index b82c683b6..3983f5d90 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -24,7 +24,9 @@ #include "KvsObject_http.h" -#warning QHttp doesn't exists anymore in Qt5, port this class or drop it +#ifdef __GNUC__ +#warning QHttp doesn't exist anymore in Qt5, port this class or drop it +#endif #if (QT_VERSION < 0x050000) #include "kvi_debug.h" |