diff options
| author |  Fabio Bas | 2009-03-24 16:32:54 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-03-24 16:32:54 +0000 |
| commit | 8654c8aa53dab5bd2e5fc3808ba29f707b474bcc (patch) | |
| tree | 7e851414316fc64bebc069c38e85647a5bdf3886 /src/modules | |
| parent | fixed a crash in mdichild management (closing a not-maximized not-channel win... (diff) | |
| download | KVIrc-8654c8aa53dab5bd2e5fc3808ba29f707b474bcc.tar.gz KVIrc-8654c8aa53dab5bd2e5fc3808ba29f707b474bcc.tar.bz2 KVIrc-8654c8aa53dab5bd2e5fc3808ba29f707b474bcc.zip | |
reworked r3156
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3160 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/modules/perlcore/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/modules/trayicon/libkvitrayicon.cpp | 8 |
3 files changed, 14 insertions, 18 deletions
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 509efef71..84f925fd9 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -31,7 +31,7 @@ SUBDIRS( mask math mediaplayer mircimport my notifier objects options - popupeditor proxydb + perlcore popupeditor proxydb raweditor regchan reguser rijndael rot13 serverdb setup sharedfile sharedfileswindow snd socketspy spaste str system texticons term theme tip tmphighlight toolbar toolbareditor torrent trayicon @@ -44,5 +44,5 @@ SUBDIRS( ) IF(COMPILE_PERL_SUPPORT) - SUBDIRS(perl perlcore) + SUBDIRS(perl) ENDIF()
\ No newline at end of file diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt index 1c4dc71ab..e22b7bc69 100644 --- a/src/modules/perlcore/CMakeLists.txt +++ b/src/modules/perlcore/CMakeLists.txt @@ -9,15 +9,19 @@ QT4_WRAP_CPP(kviperlcore_MOC_SRCS ${kviperlcore_MOC_HDRS}) SET(kvi_module_name kviperlcore) -EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts - OUTPUT_VARIABLE PERL_COMPILE_FLAGS -) +IF(COMPILE_PERL_SUPPORT) + EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts + OUTPUT_VARIABLE PERL_COMPILE_FLAGS + ) -#remove new line characters -STRING(REGEX REPLACE "(\r?\n)+$" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) -#remove leading and trailing spaces (string strip) -STRING(REGEX REPLACE "(^( )+|( )+$)" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) + #remove new line characters + STRING(REGEX REPLACE "(\r?\n)+$" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) + #remove leading and trailing spaces (string strip) + STRING(REGEX REPLACE "(^( )+|( )+$)" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) +ENDIF() INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -SET_TARGET_PROPERTIES(${kvi_module_name} PROPERTIES COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) +IF(COMPILE_PERL_SUPPORT) + SET_TARGET_PROPERTIES(${kvi_module_name} PROPERTIES COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) +ENDIF()
\ No newline at end of file diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index e9a64f429..0c8e5041c 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -220,14 +220,6 @@ void KviTrayIcon::tipRequest(KviDynamicToolTip *,const QPoint &) // return 0; //} -//FIXME: Qt4 port -/*void KviTrayIcon::mousePressEvent(QMouseEvent *e) -{ - if(e->button() & Qt::LeftButton)toggleParentFrame(); - else if(e->button() & Qt::RightButton) - m_pContextPopup->popup(mapToGlobal(e->pos())); -}*/ - void KviTrayIcon::doAway(bool) { int id; |