Windows: the qt GUI builds with Qt/MinGW. No link.
This commit is contained in:
Jean-Francois Dockes
+11
-4
@@ -175,15 +175,21 @@ void RclMain::toggleIndexing()
|
||||
if (m_idxproc) {
|
||||
// Indexing was in progress, request stop. Let the periodic
|
||||
// routine check for the results.
|
||||
int pid = m_idxproc->getChildPid();
|
||||
if (pid > 0) {
|
||||
kill(pid, SIGTERM);
|
||||
if (m_idxproc->requestChildExit()) {
|
||||
m_idxkilled = true;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case IXST_RUNNINGNOTMINE:
|
||||
{
|
||||
#ifdef _WIN32
|
||||
QMessageBox::warning(0, tr("Warning"),
|
||||
tr("The current indexing process "
|
||||
"was not started from this "
|
||||
"interface, can't kill it"),
|
||||
QMessageBox::Ok,
|
||||
QMessageBox::NoButton);
|
||||
#else
|
||||
int rep =
|
||||
QMessageBox::information(0, tr("Warning"),
|
||||
tr("The current indexing process "
|
||||
@@ -199,7 +205,8 @@ void RclMain::toggleIndexing()
|
||||
if (pid > 0)
|
||||
kill(pid, SIGTERM);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case IXST_NOTRUNNING:
|
||||
{
|
||||
|
||||
@@ -0,0 +1,188 @@
|
||||
# Note this is generated by configure on Linux (see recoll.pro.in).
|
||||
# recoll.pro is under version control anyway and used on Windows
|
||||
|
||||
TEMPLATE = app
|
||||
LANGUAGE = C++
|
||||
|
||||
QT += webkit
|
||||
|
||||
# QT += dbus
|
||||
# QMAKE_CXXFLAGS += -DUSE_ZEITGEIST
|
||||
|
||||
QT += xml
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets printsupport
|
||||
|
||||
CONFIG += qt warn_on thread release
|
||||
|
||||
HEADERS += \
|
||||
advsearch_w.h \
|
||||
advshist.h \
|
||||
confgui/confgui.h \
|
||||
confgui/confguiindex.h \
|
||||
crontool.h \
|
||||
editdialog.h \
|
||||
firstidx.h \
|
||||
fragbuts.h \
|
||||
idxsched.h \
|
||||
listdialog.h \
|
||||
preview_w.h \
|
||||
ptrans_w.h \
|
||||
rclhelp.h \
|
||||
rclmain_w.h \
|
||||
reslist.h \
|
||||
restable.h \
|
||||
rtitool.h \
|
||||
searchclause_w.h \
|
||||
snippets_w.h \
|
||||
specialindex.h \
|
||||
spell_w.h \
|
||||
ssearch_w.h \
|
||||
systray.h \
|
||||
uiprefs_w.h \
|
||||
viewaction_w.h \
|
||||
|
||||
SOURCES += \
|
||||
advsearch_w.cpp \
|
||||
advshist.cpp \
|
||||
confgui/confgui.cpp \
|
||||
confgui/confguiindex.cpp \
|
||||
crontool.cpp \
|
||||
fragbuts.cpp \
|
||||
guiutils.cpp \
|
||||
main.cpp \
|
||||
multisave.cpp \
|
||||
preview_w.cpp \
|
||||
ptrans_w.cpp \
|
||||
rclhelp.cpp \
|
||||
rclmain_w.cpp \
|
||||
rclm_idx.cpp \
|
||||
rclm_preview.cpp \
|
||||
rclm_saveload.cpp \
|
||||
rclm_view.cpp \
|
||||
rclm_wins.cpp \
|
||||
rclzg.cpp \
|
||||
respopup.cpp \
|
||||
reslist.cpp \
|
||||
restable.cpp \
|
||||
rtitool.cpp \
|
||||
searchclause_w.cpp \
|
||||
snippets_w.cpp \
|
||||
spell_w.cpp \
|
||||
ssearch_w.cpp \
|
||||
systray.cpp \
|
||||
uiprefs_w.cpp \
|
||||
viewaction_w.cpp \
|
||||
xmltosd.cpp
|
||||
|
||||
FORMS = \
|
||||
advsearch.ui \
|
||||
crontool.ui \
|
||||
editdialog.ui \
|
||||
firstidx.ui \
|
||||
idxsched.ui \
|
||||
listdialog.ui \
|
||||
ptrans.ui \
|
||||
rclmain.ui \
|
||||
restable.ui \
|
||||
rtitool.ui \
|
||||
specialindex.ui \
|
||||
spell.ui \
|
||||
snippets.ui \
|
||||
ssearchb.ui \
|
||||
uiprefs.ui \
|
||||
viewaction.ui \
|
||||
|
||||
RESOURCES = recoll.qrc
|
||||
|
||||
INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
|
||||
../utils ../aspell ../rcldb ../qtgui ../xaposix \
|
||||
confgui
|
||||
windows{
|
||||
contains(QMAKE_CC, gcc){
|
||||
# MingW
|
||||
QMAKE_CXXFLAGS += -std=c++0x -Wno-unused-parameter
|
||||
}
|
||||
contains(QMAKE_CC, cl){
|
||||
# Visual Studio
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
unix {
|
||||
UI_DIR = .ui
|
||||
MOC_DIR = .moc
|
||||
OBJECTS_DIR = .obj
|
||||
LIBS += -L../.libs -lrecoll
|
||||
|
||||
!macx {
|
||||
# Note: libdir may be substituted with sthing like $(exec_prefix)/lib
|
||||
# at this point and will go as such in the Makefile. Expansion will be
|
||||
# completed at make time.
|
||||
LIBS += -Wl,-rpath=@libdir@/recoll
|
||||
}
|
||||
|
||||
LIBS += @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
|
||||
@LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz
|
||||
|
||||
|
||||
DEPENDPATH += $$INCLUDEPATH
|
||||
}
|
||||
|
||||
UNAME = $$system(uname -s)
|
||||
contains( UNAME, [lL]inux ) {
|
||||
LIBS += -ldl -lX11
|
||||
}
|
||||
|
||||
contains( UNAME, SunOS ) {
|
||||
LIBS += -ldl
|
||||
}
|
||||
|
||||
macx {
|
||||
ICON = images/recoll.icns
|
||||
}
|
||||
|
||||
TRANSLATIONS = \
|
||||
i18n/recoll_cs.ts \
|
||||
i18n/recoll_da.ts \
|
||||
i18n/recoll_de.ts \
|
||||
i18n/recoll_el.ts \
|
||||
i18n/recoll_es.ts \
|
||||
i18n/recoll_fr.ts \
|
||||
i18n/recoll_it.ts \
|
||||
i18n/recoll_lt.ts \
|
||||
i18n/recoll_ru.ts \
|
||||
i18n/recoll_tr.ts \
|
||||
i18n/recoll_uk.ts \
|
||||
i18n/recoll_xx.ts \
|
||||
i18n/recoll_zh_CN.ts \
|
||||
i18n/recoll_zh.ts \
|
||||
|
||||
unix {
|
||||
isEmpty(PREFIX) {
|
||||
PREFIX = /usr/local
|
||||
}
|
||||
message("Prefix is $$PREFIX")
|
||||
DEFINES += PREFIX=\\\"$$PREFIX\\\"
|
||||
|
||||
# Installation stuff
|
||||
target.path = "$$PREFIX/bin"
|
||||
|
||||
imdata.files = mtpics/*.png
|
||||
imdata.path = $$PREFIX/share/recoll/images
|
||||
trdata.files = i18n/*.qm
|
||||
trdata.path = $$PREFIX/share/recoll/translations
|
||||
desktop.files += ../desktop/recoll-searchgui.desktop
|
||||
desktop.path = $$PREFIX/share/applications/
|
||||
icona.files += ../desktop/recoll.png
|
||||
icona.path = $$PREFIX/share/icons/hicolor/48x48/apps/
|
||||
iconb.files += ../desktop/recoll.png
|
||||
iconb.path = $$PREFIX/share/pixmaps/
|
||||
appdata.files = ../desktop/recoll.appdata.xml
|
||||
appdata.path = $$PREFIX/share/appdata/
|
||||
INSTALLS += target imdata trdata desktop icona iconb appdata
|
||||
|
||||
# The recollinstall script used to do the following to install zh_CN as
|
||||
# zh. Is this still needed?
|
||||
#${INSTALL} -m 0444 ${I18N}/recoll_zh_CN.qm \
|
||||
# ${datadir}/recoll/translations/recoll_zh.qm || exit 1
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
#ifndef _WIN32
|
||||
/* Copyright (C) 2005 J.F.Dockes
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@@ -174,3 +175,4 @@ out:
|
||||
if (exitdial)
|
||||
QDialog::accept();
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -31,10 +31,17 @@ class RTIToolW : public QDialog, public Ui::RTIToolW {
|
||||
init();
|
||||
}
|
||||
public slots:
|
||||
#ifdef _WIN32
|
||||
void sesclicked(bool) {}
|
||||
void accept() {}
|
||||
private:
|
||||
void init() {}
|
||||
#else
|
||||
void sesclicked(bool);
|
||||
void accept();
|
||||
private:
|
||||
void init();
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user