diff options
| -rw-r--r-- | CMakeLists.txt | 20 | ||||
| -rw-r--r-- | TODO-Qt4 | 14 | ||||
| -rw-r--r-- | TODO-doxygen | 7 | ||||
| -rw-r--r-- | data/defscript/classes.kvs | 2 | ||||
| -rw-r--r-- | doc/INSTALL | 17 |
5 files changed, 10 insertions, 50 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 31bca3c9c..437ad8c48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -910,26 +910,6 @@ ENDIF() ############################################################################### # -# Package target, `cmake . -DWITH_PACKAGES="<semicolon-separated formats>" && make package` to build packages -# ex. -DWITH_PACKAGES="RPM;TGZ" -# -############################################################################### -IF(WITH_PACKAGES) - INCLUDE (InstallRequiredSystemLibraries) - SET (CPACK_CMAKE_GENERATOR "Unix Makefiles") - SET (CPACK_PACKAGE_NAME "kvirc") - SET (CPACK_GENERATOR ${WITH_PACKAGES}) - SET (CPACK_PACKAGE_DESCRIPTION_SUMMARY "KDE based next generation IRC client with module support") - SET (CPACK_PACKAGE_VENDOR "KVIrc team") - SET (CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) - - SET (CPACK_PACKAGE_INSTALL_DIRECTORY "KVIrc") - SET (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") - SET (CPACK_PACKAGE_CONTACT "voker57@gmail.com") - INCLUDE (CPack) -ENDIF() -############################################################################### -# # The User documentation target (kvirc internal help) # ############################################################################### diff --git a/TODO-Qt4 b/TODO-Qt4 deleted file mode 100644 index a2407a5d6..000000000 --- a/TODO-Qt4 +++ /dev/null @@ -1,14 +0,0 @@ -Here there is all porting work to do. -Files listed below need working to be ported to Qt4. -They still have unworking Qt4 code, q3support, fuzzy ifdefs -os simply they're still the old unchecked kvirc3 files. - - -PLEASE KEEP THIS FILE UPDATED! - -src/kvirc/ui: - kvi_statusbar.cpp (ported to QT4, bug reordering applets using the mouse is bugged) -src/modules - addons <- done, needs graphical fixing - theme <- done, needs graphical fixing - torrent <- has yet to be finished (when ktorrent dbus interface will stabilize) diff --git a/TODO-doxygen b/TODO-doxygen index 5073029e8..95a79dafa 100644 --- a/TODO-doxygen +++ b/TODO-doxygen @@ -25,7 +25,7 @@ ext/kvi_mediatype.h ext/kvi_sharedfiles.h ext/kvi_regchan.h irc/kvi_ircmask.h - incomplete line 300 -irc/kvi_ircserver.h - incomplete line 197 and 367 +irc/kvi_ircserver.h - incomplete line 212-216 and 396-401 irc/kvi_mirccntrl.h irc/kvi_nickserv.h net/kvi_sockettype.h @@ -284,17 +284,14 @@ reguser/dialog.h reguser/wizard.h reguser/edituser.h notifier/notifiermessage.h -notifier/notifierwindowtabs.h +notifier/notifierwindowtab.h notifier/notifiersettings.h notifier/notifierwindowborder.h notifier/notifierwindow.h -notifier/notifierwindowprogressbar.h -notifier/notifierwindowbody.h about/aboutdialog.h about/libkviabout.h addon/managementdialog.h addon/addonfunctions.h -addon/packaddondialog.h ident/libkviident.h links/linkswindow.h setup/setupwizard.h diff --git a/data/defscript/classes.kvs b/data/defscript/classes.kvs index cfc9eb039..88ce2a3ef 100644 --- a/data/defscript/classes.kvs +++ b/data/defscript/classes.kvs @@ -52,7 +52,7 @@ class(installer,object) { foreach(%file,$$->%lFiles[]) { - %c .= " file.remove \"%file\"$lf"; + %c .= "file.remove \"%file\"$lf"; } } %c .= "}" diff --git a/doc/INSTALL b/doc/INSTALL index a944e2ff4..95a6c3ebf 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -42,7 +42,7 @@ General notes for the installation of the 4.0 release of KVIrc ############################################################################### In order to compile KVIrc 4.0 you need at least these softwares: - - Qt GUI Toolkit 4.4 - http://www.trolltech.com + - Qt GUI Toolkit 4.5 - http://www.trolltech.com - CMake 2.6 - http://www.cmake.org - C++ compiler, such as g++ - http://gcc.gnu.org - Pthread implementation @@ -78,7 +78,7 @@ General notes for the installation of the 4.0 release of KVIrc On my system the output is: QMake version 2.01a - Using Qt version 4.4.1 in /usr/lib/qt4/lib + Using Qt version 4.5.1 in /usr/lib64/qt/lib If you have multiple versions of qt4 installed in your system and you want to use a specific version, exporting QTDIR won't suffice. Since the cmake module searching for Qt4 uses qmake itself to determine @@ -104,7 +104,7 @@ General notes for the installation of the 4.0 release of KVIrc On my system the ouput is: - # cmake version 2.6-patch 1 + # cmake version 2.6-patch 2 # @@ -120,14 +120,11 @@ General notes for the installation of the 4.0 release of KVIrc The output on my system is: - Reading specs from /usr/lib/gcc/i486-slackware-linux/4.2.4/specs - Target: i486-slackware-linux - Configured with: ../gcc-4.2.4/configure --prefix=/usr --enable-shared - --enable-languages=ada,c,c++,fortran,java,objc --enable-threads=posix - --enable-__cxa_atexit --disable-checking --with-gnu-ld --verbose - --with-arch=i486 --target=i486-slackware-linux --host=i486-slackware-linux + Reading specs from /usr/lib64/gcc/x86_64-slackware-linux/4.3.3/specs + Target: x86_64-slackware-linux + Configured with: ../gcc-4.3.3/configure --prefix=/usr --libdir=/usr/lib64 --enable-shared --enable-bootstrap --enable-languages=ada,c,c++,fortran,java,objc --enable-threads=posix --enable-checking=release --with-system-zlib --disable-libunwind-exceptions --enable-__cxa_atexit --enable-libssp --with-gnu-ld --verbose --disable-multilib --target=x86_64-slackware-linux --build=x86_64-slackware-linux --host=x86_64-slackware-linux Thread model: posix - gcc version 4.2.4 + gcc version 4.3.3 (GCC) # |