Commit 7ca911206b20418a6e4a6cc70bb23cddc3671bce

Fixes
  
2222SET (QT_USE_QTNETWORK true)
2323SET (QT_USE_QTXML true)
2424SET (QT_USE_QTSCRIPT true)
25SET (QUTIM_LIBS "")
2625
2726SET (QUTIM_PLUGINS_DEST "lib/qutim/")
2827FIND_PACKAGE (Qt4 REQUIRED)
8787set( QUTIM_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE FILEPATH "Path to qutim sources")
8888set( QUTIM_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE FILEPATH "Path to qutim build directory")
8989option( QUTIM_COPY_PLUGINS_TO_BINARY_DIR "Copy plugins to qutim build directory" OFF )
90set( QUTIM_LIBRARY libqutim )
90LIST(APPEND QUTIM_LIBRARIES libqutim )
9191
9292QT4_WRAP_CPP (MOC_SRCS ${HEADERS})
9393QT4_WRAP_UI (UIS_H ${FORMS})
  
251251 endif ( QUTIM_COPY_PLUGINS_TO_BINARY_DIR AND QUTIM_BINARY_DIR AND NOT QUTIM_${plugin_name}_STATIC )
252252
253253 # Link with QT
254 target_link_libraries( ${plugin_name} ${QT_LIBRARIES} ${QUTIM_LIBRARY} ${QUTIM_${plugin_name}_LINK_LIBRARIES} )
254 target_link_libraries( ${plugin_name} ${QT_LIBRARIES} ${QUTIM_LIBRARIES} ${QUTIM_${plugin_name}_LINK_LIBRARIES} )
255255
256256 if( LANGUAGE AND NOT QUTIM_${plugin_name}_SUBPLUGIN AND NOT QUTIM_${plugin_name}_EXTENSION )
257257 language_update( ${plugin_name} ${LANGUAGE} "${CMAKE_CURRENT_SOURCE_DIR}" )
  
2424macro ( FIND_QUTIM_03 src_dir )
2525 if ( NOT FOUND_QUTIM_03 )
2626 find_path( QUTIM_INCLUDE_DIRS NAMES "qutim/plugin.h" PATHS "../../" "../" "${src_dir}/../../" "${src_dir}/../" )
27 find_library( QUTIM_LIBRARY qutim PATHS ${QUTIM_LIBRARY_DIR} )
28 if ( QUTIM_INCLUDE_DIRS AND QUTIM_LIBRARY )
29 message ( "Found qutim: ${QUTIM_LIBRARY}" )
27 find_library( QUTIM_LIBRARIES qutim PATHS ${QUTIM_LIBRARY_DIR} )
28 if ( QUTIM_INCLUDE_DIRS AND QUTIM_LIBRARIES )
29 message ( "Found qutim: ${QUTIM_LIBRARIES}" )
3030 # This is very very nasty hack:
3131 set ( QUTIM_INCLUDE_DIRS ${QUTIM_INCLUDE_DIRS} "${QUTIM_INCLUDE_DIRS}/src" )
3232 set ( FOUND_QUTIM_03 TRUE )
33 else ( QUTIM_INCLUDE_DIRS AND QUTIM_LIBRARY )
33 else ( QUTIM_INCLUDE_DIRS AND QUTIM_LIBRARIES )
3434 message ( FATAL_ERROR "Could not find qutIM development headers" )
35 endif ( QUTIM_INCLUDE_DIRS AND QUTIM_LIBRARY )
35 endif ( QUTIM_INCLUDE_DIRS AND QUTIM_LIBRARIES )
3636 endif ( NOT FOUND_QUTIM_03 )
3737endmacro ( FIND_QUTIM_03 )
3838
103103 INSTALL( TARGETS ${plugin_name} DESTINATION "lib/qutim/plugins" )
104104
105105 # Link with QT
106 TARGET_LINK_LIBRARIES( ${plugin_name} ${QT_LIBRARIES} ${QUTIM_LIBRARY} ${libs_to_link} ${ARGN})
106 TARGET_LINK_LIBRARIES( ${plugin_name} ${QT_LIBRARIES} ${QUTIM_LIBRARIES} ${libs_to_link} ${ARGN})
107107
108108 if( LANGUAGE )
109109 LANGUAGE_UPDATE( ${plugin_name} ${LANGUAGE} "${CMAKE_CURRENT_SOURCE_DIR}" )
  
263263 d->edit = new QLineEdit(this);
264264 connect(d->edit,SIGNAL(textChanged(QString)),SIGNAL(pathChanged(QString)));
265265 QToolButton *btn = new QToolButton(this);
266 btn->setText("...");
266267 layout()->addWidget(d->edit);
267268 layout()->addWidget(btn);
268269 connect(btn,SIGNAL(clicked(bool)),d,SLOT(onButtonClicked(bool)));