[packages/qesteidutil] fix for clementine api patched QtSingleApplication ambiguity

glen glen at pld-linux.org
Mon Feb 23 08:22:02 CET 2015


commit 7f877c1f24974325ac4f81a9aa89fedede2f4443
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Feb 23 09:21:11 2015 +0200

    fix for clementine api patched QtSingleApplication ambiguity
    
    /home/users/glen/rpm/packages/BUILD.x86_64-linux/qesteidutil-3.8.0.1106/src/main.cpp: In function ‘int main(int, char**)’:
    /home/users/glen/rpm/packages/BUILD.x86_64-linux/qesteidutil-3.8.0.1106/src/main.cpp:66:23: error: call of overloaded ‘sendMessage(const char [1])’ is ambiguous
       app.sendMessage( "" );
                           ^
    /home/users/glen/rpm/packages/BUILD.x86_64-linux/qesteidutil-3.8.0.1106/src/main.cpp:66:23: note: candidates are:
    In file included from /usr/include/qt4/QtSolutions/QtSingleApplication:1:0,
                     from /home/users/glen/rpm/packages/BUILD.x86_64-linux/qesteidutil-3.8.0.1106/common/Common.h:35,
                     from /home/users/glen/rpm/packages/BUILD.x86_64-linux/qesteidutil-3.8.0.1106/src/main.cpp:23:
    /usr/include/qt4/QtSolutions/qtsingleapplication.h:91:10: note: bool QtSingleApplication::sendMessage(const QString&, int)
         bool sendMessage(const QString &message, int timeout = 5000);
              ^
    /usr/include/qt4/QtSolutions/qtsingleapplication.h:92:10: note: bool QtSingleApplication::sendMessage(const QByteArray&, int)
         bool sendMessage(const QByteArray &message, int timeout = 5000);
              ^
    CMakeFiles/qesteidutil.dir/build.make:117: recipe for target 'CMakeFiles/qesteidutil.dir/src/main.cpp.o' failed

 system_qtsingleapplication.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
---
diff --git a/system_qtsingleapplication.patch b/system_qtsingleapplication.patch
index e60abe4..ac48d0e 100644
--- a/system_qtsingleapplication.patch
+++ b/system_qtsingleapplication.patch
@@ -31,3 +31,15 @@
  typedef QtSingleApplication BaseApplication;
  #endif
  
+--- qesteidutil-3.8.0.1106/src/main.cpp~	2015-02-23 09:19:12.000000000 +0200
++++ qesteidutil-3.8.0.1106/src/main.cpp	2015-02-23 09:19:35.942253525 +0200
+@@ -63,7 +63,8 @@
+ #ifndef Q_OS_MAC
+ 	if( app.isRunning() )
+ 	{
+-		app.sendMessage( "" );
++		QString message = "";
++		app.sendMessage( message );
+ 		return 0;
+ 	}
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qesteidutil.git/commitdiff/7f877c1f24974325ac4f81a9aa89fedede2f4443



More information about the pld-cvs-commit mailing list