Merge branch 'master' into google

Conflicts:
	src/plugins/google/google.pro

diff --cc src/plugins/google/google.pro
index 937bfe4,a7c7bd5..aa78f4c
--- 1/src/plugins/google/google.pro
--- 2/src/plugins/google/google.pro
+++ b/src/plugins/google/google.pro
@@@ -22,10 -22,5 +22,12 @@@ HEADERS += 
  RESOURCES += \
      icons.qrc
  
 +
 +unix {
 +  INSTALLS += plugin-icon
 +
 +  plugin-icon.path = $$DATA_DIR
 +  plugin-icon.files += drawing.png
 +}
+ check.commands = echo 'No check here'
+ QMAKE_EXTRA_TARGETS += check

diff --cc src/plugins/xdxf/xdxf.pro
index a0ac19b,d7e0f6a..ac31c1a
--- 1/src/plugins/xdxf/xdxf.pro
--- 2/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@@ -33,8 -33,7 +33,10 @@@ unix 
    dicts.path = $$PLUGINS_DIR
    dicts.files += ../../../data/dicts/eng-us.xdxf
    dicts.files += ../../../data/dicts/eng-thai.xdxf
 +
 +  plugin-icon.path = $$DATA_DIR
 +  plugin-icon.files += xdxf.png
  }
  
+ check.commands = echo 'No check here'
+ QMAKE_EXTRA_TARGETS += check