Commit 688ac066 authored by Denis Steckelmacher's avatar Denis Steckelmacher
Browse files

Build against Baloo master and its query parser

parent 01b0529f
......@@ -21,13 +21,6 @@ set_package_properties(KFileMetaData PROPERTIES
TYPE REQUIRED
)
find_package(BalooQueryParser)
set_package_properties(BalooQueryParser PROPERTIES
DESCRIPTION "Parser for natural language queries"
URL "https://projects.kde.org/baloo-queryparser"
TYPE OPTIONAL
)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
# Some definitions
......@@ -40,7 +33,6 @@ include_directories(
${KDE4_INCLUDES}
${BALOO_INCLUDE_DIR}
${KFILEMETADATA_INCLUDE_DIR}
${BALOO_QUERYPARSER_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src
)
......
......@@ -10,17 +10,12 @@ set(ui_SRCS
kcommentwidget.cpp
metadatafilter.cpp
widgetfactory.cpp
groupedlineedit.cpp
querybuilder.cpp
querybuildercompleter.cpp
)
if (${BalooQueryParser_FOUND})
set(querybuilder_SRCS
groupedlineedit.cpp
querybuilder.cpp
querybuildercompleter.cpp
)
endif(${BalooQueryParser_FOUND})
set(widgets_SRCS ${ui_SRCS} ${querybuilder_SRCS})
set(widgets_SRCS ${ui_SRCS})
kde4_add_library(baloowidgets SHARED ${LIBRARY_TYPE} ${widgets_SRCS})
......@@ -33,7 +28,6 @@ target_link_libraries(baloowidgets
${KDE4_KIO_LIBS}
${BALOO_LIBRARIES}
${KFILEMETADATA_LIBRARY}
${BALOO_QUERYPARSER_LIBRARY}
)
target_link_libraries(baloowidgets
......
......@@ -21,8 +21,8 @@
#include "groupedlineedit.h"
#include "querybuildercompleter_p.h"
#include <balooqueryparser/completionproposal.h>
#include <balooqueryparser/queryparser.h>
#include <baloo/completionproposal.h>
#include <baloo/queryparser.h>
#include <baloo/term.h>
using namespace Baloo;
......
......@@ -31,12 +31,9 @@ target_link_libraries(metadataconfigwidgetapp
baloowidgets
)
if (${BalooQueryParser_FOUND})
kde4_add_executable(querybuilderapp TEST querybuilderapp.cpp )
target_link_libraries(querybuilderapp
${KDE4_KIO_LIBS}
${BALOO_LIBRARIES}
${BALOO_QUERYPARSER_LIBRARY}
baloowidgets
)
endif(${BalooQueryParser_FOUND})
kde4_add_executable(querybuilderapp TEST querybuilderapp.cpp )
target_link_libraries(querybuilderapp
${KDE4_KIO_LIBS}
${BALOO_LIBRARIES}
baloowidgets
)
/* This file is part of the Nepomuk widgets collection
Copyright (c) 2013 Denis Steckelmacher <steckdenis@yahoo.fr>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License version 2.1 as published by the Free Software Foundation,
or any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#include "querybuilder.h"
#include <QApplication>
#include <balooqueryparser/queryparser.h>
#include <kcomponentdata.h>
int main(int argc, char **argv)
{
QApplication app(argc, argv);
KComponentData data("QueryBuilderApp");
Baloo::QueryParser parser;
Baloo::QueryBuilder builder(&parser, 0);
builder.show();
return app.exec();
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment