revert r612696 by myself, I should really check to which branch I'm
committing... svn path=/branches/work/kwin_composite/; revision=612703
This commit is contained in:
parent
dc540f80ea
commit
d0eabbffc3
3 changed files with 4 additions and 4 deletions
|
@ -8,7 +8,7 @@ kde4_automoc(kwin_update_window_settings ${kwin_update_window_settings_SRCS})
|
|||
|
||||
kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_SRCS})
|
||||
|
||||
target_link_libraries( kwin_update_window_settings ${KDE4_KDECORE_LIBS} ${QT_QT3SUPPORT_LIBRARY})
|
||||
target_link_libraries( kwin_update_window_settings ${KDE4_KDECORE_LIBS} )
|
||||
|
||||
install_targets(/lib/kconf_update_bin/ kwin_update_window_settings )
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
|
|||
|
||||
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinoptions )
|
||||
|
||||
target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
|
||||
target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
|
||||
|
||||
install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include <QVBoxLayout>
|
||||
#include <kmessagebox.h>
|
||||
|
||||
#include <k3activelabel.h>
|
||||
#include <kactivelabel.h>
|
||||
#include <klocale.h>
|
||||
#include <kcolorbutton.h>
|
||||
#include <kconfig.h>
|
||||
|
@ -1244,7 +1244,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, KI
|
|||
QVBoxLayout *lay = new QVBoxLayout (this);
|
||||
kompmgrAvailable_ = kompmgrAvailable();
|
||||
if (!kompmgrAvailable_){
|
||||
K3ActiveLabel *label = new K3ActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>"
|
||||
KActiveLabel *label = new KActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>"
|
||||
"Please make sure you have "
|
||||
"<a href=\"http://www.freedesktop.org/\">Xorg ≥ 6.8</a>,"
|
||||
" and have installed the kompmgr that came with kwin.<br>"
|
||||
|
|
Loading…
Reference in a new issue