From 8e42c8964bee1511fcc43b5d6e92088a3a2ab38c Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 21 Mar 2011 12:49:44 +0100 Subject: [PATCH] * Fixed JavaScript errors causing a Pipeline assert. --- src/resolvers/qtscriptresolver.cpp | 2 +- thirdparty/qtweetlib/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolvers/qtscriptresolver.cpp b/src/resolvers/qtscriptresolver.cpp index 3b494fd61..b7e7caa40 100644 --- a/src/resolvers/qtscriptresolver.cpp +++ b/src/resolvers/qtscriptresolver.cpp @@ -91,7 +91,7 @@ ScriptEngine::resolve( const Tomahawk::query_ptr& query ) QVariantMap m = mainFrame()->evaluateJavaScript( eval ).toMap(); qDebug() << "JavaScript Result:" << m; - const QString qid = m.value( "qid" ).toString(); + const QString qid = query->id(); const QVariantList reslist = m.value( "results" ).toList(); foreach( const QVariant& rv, reslist ) diff --git a/thirdparty/qtweetlib/CMakeLists.txt b/thirdparty/qtweetlib/CMakeLists.txt index c68f22031..2f93871af 100644 --- a/thirdparty/qtweetlib/CMakeLists.txt +++ b/thirdparty/qtweetlib/CMakeLists.txt @@ -180,6 +180,6 @@ target_link_libraries(tomahawk_qtweetlib INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys ) -INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib${LIB_SUFFIX}) +INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib)