Compare commits
No commits in common. "rawhide" and "master" have entirely different histories.
9
.gitignore
vendored
9
.gitignore
vendored
@ -6,12 +6,3 @@
|
|||||||
/qttools-everywhere-src-5.12.1.tar.xz
|
/qttools-everywhere-src-5.12.1.tar.xz
|
||||||
/qttools-everywhere-src-5.12.3.tar.xz
|
/qttools-everywhere-src-5.12.3.tar.xz
|
||||||
/qttools-everywhere-src-5.12.4.tar.xz
|
/qttools-everywhere-src-5.12.4.tar.xz
|
||||||
/qttools-everywhere-src-5.12.5.tar.xz
|
|
||||||
/qttools-everywhere-src-5.13.2.tar.xz
|
|
||||||
/qttools-everywhere-src-5.14.2.tar.xz
|
|
||||||
/qttools-everywhere-src-5.15.1.tar.xz
|
|
||||||
/qttools-everywhere-src-5.15.2.tar.xz
|
|
||||||
/qttools-everywhere-opensource-src-5.15.3.tar.xz
|
|
||||||
/qttools-everywhere-opensource-src-5.15.4.tar.xz
|
|
||||||
/qttools-everywhere-opensource-src-5.15.5.tar.xz
|
|
||||||
/qttools-everywhere-opensource-src-5.15.6.tar.xz
|
|
||||||
|
|||||||
@ -1,74 +0,0 @@
|
|||||||
diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri
|
|
||||||
index 4f3d776..bcd2aae 100644
|
|
||||||
--- a/src/qdoc/configure.pri
|
|
||||||
+++ b/src/qdoc/configure.pri
|
|
||||||
@@ -146,33 +146,6 @@ defineTest(qtConfTest_libclang) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
!equals(QMAKE_HOST.os, Darwin):!msvc: CLANG_LIBS+=-Wl,--start-group
|
|
||||||
- CLANG_LIBS += -lclangAnalysis \
|
|
||||||
- -lclangARCMigrate \
|
|
||||||
- -lclangAST \
|
|
||||||
- -lclangASTMatchers \
|
|
||||||
- -lclangBasic \
|
|
||||||
- -lclangCodeGen \
|
|
||||||
- -lclangCrossTU \
|
|
||||||
- -lclangDriver \
|
|
||||||
- -lclangDynamicASTMatchers \
|
|
||||||
- -lclangEdit \
|
|
||||||
- -lclangFormat \
|
|
||||||
- -lclangFrontend \
|
|
||||||
- -lclangFrontendTool \
|
|
||||||
- -lclangHandleCXX \
|
|
||||||
- -lclangIndex \
|
|
||||||
- -lclangLex \
|
|
||||||
- -lclangParse \
|
|
||||||
- -lclangRewrite \
|
|
||||||
- -lclangRewriteFrontend \
|
|
||||||
- -lclangSema \
|
|
||||||
- -lclangSerialization \
|
|
||||||
- -lclangStaticAnalyzerCheckers \
|
|
||||||
- -lclangStaticAnalyzerCore \
|
|
||||||
- -lclangStaticAnalyzerFrontend \
|
|
||||||
- -lclangTooling \
|
|
||||||
- -lclangToolingASTDiff \
|
|
||||||
- -lclangToolingCore
|
|
||||||
|
|
||||||
versionIsAtLeast($$CLANG_VERSION, "10.0.0") {
|
|
||||||
equals(QMAKE_HOST.os, Windows): \
|
|
||||||
@@ -187,34 +160,7 @@ defineTest(qtConfTest_libclang) {
|
|
||||||
else: \
|
|
||||||
CLANG_LIBS += -lclang_static
|
|
||||||
|
|
||||||
- CLANG_LIBS += \
|
|
||||||
- -lclangApplyReplacements \
|
|
||||||
- -lclangChangeNamespace \
|
|
||||||
- -lclangDaemon \
|
|
||||||
- -lclangIncludeFixer \
|
|
||||||
- -lclangIncludeFixerPlugin \
|
|
||||||
- -lclangMove \
|
|
||||||
- -lclangQuery \
|
|
||||||
- -lclangReorderFields \
|
|
||||||
- -lclangTidy \
|
|
||||||
- -lclangTidyAndroidModule \
|
|
||||||
- -lclangTidyBoostModule \
|
|
||||||
- -lclangTidyBugproneModule \
|
|
||||||
- -lclangTidyCERTModule \
|
|
||||||
- -lclangTidyCppCoreGuidelinesModule \
|
|
||||||
- -lclangTidyFuchsiaModule \
|
|
||||||
- -lclangTidyGoogleModule \
|
|
||||||
- -lclangTidyHICPPModule \
|
|
||||||
- -lclangTidyLLVMModule \
|
|
||||||
- -lclangTidyMiscModule \
|
|
||||||
- -lclangTidyModernizeModule \
|
|
||||||
- -lclangTidyMPIModule \
|
|
||||||
- -lclangTidyObjCModule \
|
|
||||||
- -lclangTidyPerformanceModule \
|
|
||||||
- -lclangTidyPlugin \
|
|
||||||
- -lclangTidyReadabilityModule \
|
|
||||||
- -lclangTidyUtils \
|
|
||||||
- -lclangToolingRefactor \
|
|
||||||
+ CLANG_LIBS += -lclang-cpp \
|
|
||||||
-lfindAllSymbols
|
|
||||||
}
|
|
||||||
|
|
||||||
120
qt5-qttools.spec
120
qt5-qttools.spec
@ -1,8 +1,5 @@
|
|||||||
%global qt_module qttools
|
%global qt_module qttools
|
||||||
|
|
||||||
# Disable automatic .la file removal
|
|
||||||
%global __brp_remove_la_files %nil
|
|
||||||
|
|
||||||
#global bootstrap 1
|
#global bootstrap 1
|
||||||
|
|
||||||
%if ! 0%{?bootstrap}
|
%if ! 0%{?bootstrap}
|
||||||
@ -12,25 +9,21 @@
|
|||||||
|
|
||||||
Summary: Qt5 - QtTool components
|
Summary: Qt5 - QtTool components
|
||||||
Name: qt5-qttools
|
Name: qt5-qttools
|
||||||
Version: 5.15.6
|
Version: 5.12.4
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
License: LGPLv3 or LGPLv2
|
License: LGPLv3 or LGPLv2
|
||||||
Url: http://www.qt.io
|
Url: http://www.qt.io
|
||||||
%global majmin %(echo %{version} | cut -d. -f1-2)
|
%global majmin %(echo %{version} | cut -d. -f1-2)
|
||||||
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
|
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
|
||||||
|
|
||||||
# help lrelease/lupdate use/prefer qmake-qt5
|
# help lrelease/lupdate use/prefer qmake-qt5
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893
|
||||||
Patch2: qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch
|
Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch
|
||||||
|
|
||||||
# 32-bit MIPS needs explicit -latomic
|
# 32-bit MIPS needs explicit -latomic
|
||||||
Patch4: qttools-opensource-src-5.7-add-libatomic.patch
|
Patch4: qttools-opensource-src-5.7-add-libatomic.patch
|
||||||
|
|
||||||
# Link against libclang-cpp.so
|
|
||||||
# https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package
|
|
||||||
Patch5: 0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
|
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
|
|
||||||
Source20: assistant.desktop
|
Source20: assistant.desktop
|
||||||
@ -38,7 +31,6 @@ Source21: designer.desktop
|
|||||||
Source22: linguist.desktop
|
Source22: linguist.desktop
|
||||||
Source23: qdbusviewer.desktop
|
Source23: qdbusviewer.desktop
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
# %%check needs cmake (and don't want to mess with cmake28)
|
# %%check needs cmake (and don't want to mess with cmake28)
|
||||||
%if 0%{?fedora} || 0%{?rhel} > 6
|
%if 0%{?fedora} || 0%{?rhel} > 6
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
@ -174,11 +166,10 @@ Requires: %{name}-common = %{version}-%{release}
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{qt_module}-everywhere-src-%{version}
|
%setup -q -n %{qt_module}-everywhere-src-%{version}
|
||||||
%patch2 -p1 -b ..runqttools-with-qt5-suffix.patch
|
%patch2 -p1 -b .qmake-qt5
|
||||||
%ifarch %{mips32}
|
%ifarch %{mips32}
|
||||||
%patch4 -p1 -b .libatomic
|
%patch4 -p1 -b .libatomic
|
||||||
%endif
|
%endif
|
||||||
%patch5 -p1 -b .libclang-cpp
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -214,7 +205,7 @@ mkdir %{buildroot}%{_bindir}
|
|||||||
pushd %{buildroot}%{_qt5_bindir}
|
pushd %{buildroot}%{_qt5_bindir}
|
||||||
for i in * ; do
|
for i in * ; do
|
||||||
case "${i}" in
|
case "${i}" in
|
||||||
assistant|designer|lconvert|linguist|lrelease|lupdate|lprodump|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
|
assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
|
||||||
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5
|
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5
|
||||||
ln -sv ${i} ${i}-qt5
|
ln -sv ${i} ${i}-qt5
|
||||||
;;
|
;;
|
||||||
@ -361,7 +352,6 @@ fi
|
|||||||
%{_qt5_bindir}/designer*
|
%{_qt5_bindir}/designer*
|
||||||
%{_datadir}/applications/*designer.desktop
|
%{_datadir}/applications/*designer.desktop
|
||||||
%{_datadir}/icons/hicolor/*/apps/designer*.*
|
%{_datadir}/icons/hicolor/*/apps/designer*.*
|
||||||
%{_qt5_libdir}/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfig*.cmake
|
|
||||||
|
|
||||||
%if 0%{?webkit}
|
%if 0%{?webkit}
|
||||||
%files -n qt5-designer-plugin-webkit
|
%files -n qt5-designer-plugin-webkit
|
||||||
@ -395,11 +385,9 @@ fi
|
|||||||
%{_bindir}/lconvert*
|
%{_bindir}/lconvert*
|
||||||
%{_bindir}/lrelease*
|
%{_bindir}/lrelease*
|
||||||
%{_bindir}/lupdate*
|
%{_bindir}/lupdate*
|
||||||
%{_bindir}/lprodump*
|
|
||||||
%{_qt5_bindir}/lconvert*
|
%{_qt5_bindir}/lconvert*
|
||||||
%{_qt5_bindir}/lrelease*
|
%{_qt5_bindir}/lrelease*
|
||||||
%{_qt5_bindir}/lupdate*
|
%{_qt5_bindir}/lupdate*
|
||||||
%{_qt5_bindir}/lprodump*
|
|
||||||
# cmake config
|
# cmake config
|
||||||
%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/
|
%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/
|
||||||
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
|
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
|
||||||
@ -444,24 +432,18 @@ fi
|
|||||||
%{_qt5_libdir}/libQt5Designer*.so
|
%{_qt5_libdir}/libQt5Designer*.so
|
||||||
%{_qt5_libdir}/libQt5Help.prl
|
%{_qt5_libdir}/libQt5Help.prl
|
||||||
%{_qt5_libdir}/libQt5Help.so
|
%{_qt5_libdir}/libQt5Help.so
|
||||||
%{_qt5_libdir}/Qt5UiPlugin.la
|
|
||||||
%{_qt5_libdir}/libQt5UiPlugin.prl
|
|
||||||
%{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake
|
%{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake
|
||||||
%dir %{_qt5_libdir}/cmake/Qt5Help/
|
%dir %{_qt5_libdir}/cmake/Qt5Help/
|
||||||
%{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake
|
%{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake
|
||||||
%{_qt5_libdir}/cmake/Qt5UiPlugin/
|
%{_qt5_libdir}/cmake/Qt5UiPlugin/
|
||||||
%{_qt5_libdir}/pkgconfig/Qt5Designer.pc
|
%{_qt5_libdir}/pkgconfig/Qt5Designer.pc
|
||||||
%{_qt5_libdir}/pkgconfig/Qt5Help.pc
|
%{_qt5_libdir}/pkgconfig/Qt5Help.pc
|
||||||
%{_qt5_libdir}/pkgconfig/Qt5UiPlugin.pc
|
|
||||||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer.pri
|
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer.pri
|
||||||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri
|
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri
|
||||||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri
|
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri
|
||||||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri
|
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri
|
||||||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri
|
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri
|
||||||
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
|
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
|
||||||
# putting these here for now, new stuff in 5.14, review for accuracy -- rdieter
|
|
||||||
%{_qt5_libdir}/cmake/Qt5AttributionsScannerTools/
|
|
||||||
%{_qt5_libdir}/cmake/Qt5DocTools/
|
|
||||||
|
|
||||||
%files static
|
%files static
|
||||||
%{_qt5_headerdir}/QtUiTools/
|
%{_qt5_headerdir}/QtUiTools/
|
||||||
@ -482,96 +464,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Sep 20 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.6-1
|
|
||||||
- 5.15.6
|
|
||||||
|
|
||||||
* Mon Sep 19 2022 Pete Walter <pwalter@fedoraproject.org> - 5.15.5-3
|
|
||||||
- Rebuild for clang 15
|
|
||||||
|
|
||||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
|
|
||||||
- 5.15.5
|
|
||||||
|
|
||||||
* Mon May 16 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-1
|
|
||||||
- 5.15.4
|
|
||||||
|
|
||||||
* Fri Mar 04 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
|
|
||||||
- 5.15.3
|
|
||||||
|
|
||||||
* Mon Jan 24 2022 Timm Bäeder <tbaeder@redhat.com> - 5.15.2-10
|
|
||||||
- Disable automatic .la file removal
|
|
||||||
- https://fedoraproject.org/wiki/Changes/RemoveLaFiles
|
|
||||||
|
|
||||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-9
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Oct 07 2021 Tom Stellard <tstellar@redhat.com> - 5.15.2-8
|
|
||||||
- Rebuild for llvm-13.0.0
|
|
||||||
|
|
||||||
* Thu Sep 30 2021 Kalev Lember <klember@redhat.com> - 5.15.2-7
|
|
||||||
- Rebuild for clang 13.0.0~rc1
|
|
||||||
|
|
||||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 22 2021 Tom Stellard <tstellar@redhat.com> - 5.15.2-4
|
|
||||||
- Rebuild for clang-11.1.0
|
|
||||||
|
|
||||||
* Thu Dec 10 14:18:27 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-3
|
|
||||||
- Bump for eln build
|
|
||||||
|
|
||||||
* Tue Nov 24 07:54:16 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
|
|
||||||
- Rebuild for qtbase with -no-reduce-relocations option
|
|
||||||
|
|
||||||
* Fri Nov 20 09:30:47 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
|
|
||||||
- 5.15.2
|
|
||||||
|
|
||||||
* Tue Oct 27 2020 Leigh Scott <leigh123linux@gmail.com> - 5.15.1-3
|
|
||||||
- Bump to fix hash issue on rpmfusion koji
|
|
||||||
|
|
||||||
* Mon Oct 19 2020 Kalev Lember <klember@redhat.com> - 5.15.1-2
|
|
||||||
- Disable lto to work around lconvert segfaulting on armv7hl (#1884681)
|
|
||||||
|
|
||||||
* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
|
|
||||||
- 5.15.1
|
|
||||||
|
|
||||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-3
|
|
||||||
- Second attempt - Rebuilt for
|
|
||||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
|
|
||||||
- 5.14.2
|
|
||||||
|
|
||||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 06 2020 Tom Stellard <tstellar@redhat.com> - 5.13.2-4
|
|
||||||
- Link against libclang-cpp.so
|
|
||||||
- https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package
|
|
||||||
|
|
||||||
* Wed Dec 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-3
|
|
||||||
- Use -qt5 suffix for linguist tools
|
|
||||||
|
|
||||||
* Wed Dec 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-2
|
|
||||||
- Move lprodump to qt5-linguist
|
|
||||||
|
|
||||||
* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
|
|
||||||
- 5.13.2
|
|
||||||
|
|
||||||
* Thu Sep 26 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-2
|
|
||||||
- rebuild (clang)
|
|
||||||
|
|
||||||
* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
|
|
||||||
- 5.12.5
|
|
||||||
|
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
@ -1,49 +0,0 @@
|
|||||||
diff --git a/src/linguist/lprodump/main.cpp b/src/linguist/lprodump/main.cpp
|
|
||||||
index 857786b..2a65299 100644
|
|
||||||
--- a/src/linguist/lprodump/main.cpp
|
|
||||||
+++ b/src/linguist/lprodump/main.cpp
|
|
||||||
@@ -438,7 +438,7 @@ int main(int argc, char **argv)
|
|
||||||
ProFileGlobals option;
|
|
||||||
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
|
|
||||||
if (option.qmake_abslocation.isEmpty())
|
|
||||||
- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
|
|
||||||
+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5");
|
|
||||||
option.debugLevel = proDebug;
|
|
||||||
option.initProperties();
|
|
||||||
option.setCommandLineArguments(QDir::currentPath(),
|
|
||||||
diff --git a/src/linguist/lrelease-pro/main.cpp b/src/linguist/lrelease-pro/main.cpp
|
|
||||||
index 9f4ca25..207f401 100644
|
|
||||||
--- a/src/linguist/lrelease-pro/main.cpp
|
|
||||||
+++ b/src/linguist/lrelease-pro/main.cpp
|
|
||||||
@@ -145,6 +145,6 @@ int main(int argc, char **argv)
|
|
||||||
projectDescription->setAutoRemove(false);
|
|
||||||
lreleaseOptions << QStringLiteral("-project") << projectDescription->fileName();
|
|
||||||
|
|
||||||
- runQtTool(QStringLiteral("lrelease"), lreleaseOptions);
|
|
||||||
+ runQtTool(QStringLiteral("lrelease-qt5"), lreleaseOptions);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
diff --git a/src/linguist/lupdate-pro/main.cpp b/src/linguist/lupdate-pro/main.cpp
|
|
||||||
index ab5b7eb..1ce039c 100644
|
|
||||||
--- a/src/linguist/lupdate-pro/main.cpp
|
|
||||||
+++ b/src/linguist/lupdate-pro/main.cpp
|
|
||||||
@@ -154,6 +154,6 @@ int main(int argc, char **argv)
|
|
||||||
projectDescription->setAutoRemove(false);
|
|
||||||
lupdateOptions << QStringLiteral("-project") << projectDescription->fileName();
|
|
||||||
|
|
||||||
- runQtTool(QStringLiteral("lupdate"), lupdateOptions);
|
|
||||||
+ runQtTool(QStringLiteral("lupdate-qt5"), lupdateOptions);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
diff --git a/src/linguist/shared/runqttool.cpp b/src/linguist/shared/runqttool.cpp
|
|
||||||
index e36a3a2..020fe06 100644
|
|
||||||
--- a/src/linguist/shared/runqttool.cpp
|
|
||||||
+++ b/src/linguist/shared/runqttool.cpp
|
|
||||||
@@ -114,6 +114,6 @@ std::unique_ptr<QTemporaryFile> createProjectDescription(QStringList args)
|
|
||||||
}
|
|
||||||
file->close();
|
|
||||||
args << QStringLiteral("-out") << file->fileName();
|
|
||||||
- runQtTool(QStringLiteral("lprodump"), args);
|
|
||||||
+ runQtTool(QStringLiteral("lprodump-qt5"), args);
|
|
||||||
return file;
|
|
||||||
}
|
|
||||||
351
qttools-opensource-src-5.3.2-system-clucene.patch
Normal file
351
qttools-opensource-src-5.3.2-system-clucene.patch
Normal file
@ -0,0 +1,351 @@
|
|||||||
|
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri
|
||||||
|
--- qttools-opensource-src-5.3.2/src/assistant/clucene/fulltextsearch.pri 2014-09-11 12:48:25.000000000 +0200
|
||||||
|
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/fulltextsearch.pri 2014-10-31 23:44:32.368856494 +0100
|
||||||
|
@@ -1,125 +1,7 @@
|
||||||
|
-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
|
||||||
|
-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
|
||||||
|
-
|
||||||
|
-CLUCENEDIR = ../3rdparty/clucene/src/CLucene
|
||||||
|
-
|
||||||
|
-INCLUDEPATH += . .. \
|
||||||
|
- $$CLUCENEDIR \
|
||||||
|
- $$CLUCENEDIR/../ \
|
||||||
|
- $$CLUCENEDIR/analysis \
|
||||||
|
- $$CLUCENEDIR/analysis/standard \
|
||||||
|
- $$CLUCENEDIR/config \
|
||||||
|
- $$CLUCENEDIR/debug \
|
||||||
|
- $$CLUCENEDIR/document \
|
||||||
|
- $$CLUCENEDIR/index \
|
||||||
|
- $$CLUCENEDIR/queryParser \
|
||||||
|
- $$CLUCENEDIR/search \
|
||||||
|
- $$CLUCENEDIR/store \
|
||||||
|
- $$CLUCENEDIR/util
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-SOURCES += $$CLUCENEDIR/StdHeader.cpp \
|
||||||
|
- $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
|
||||||
|
- $$CLUCENEDIR/analysis/Analyzers.cpp \
|
||||||
|
- $$CLUCENEDIR/config/gunichartables.cpp \
|
||||||
|
- $$CLUCENEDIR/config/repl_lltot.cpp \
|
||||||
|
- $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
|
||||||
|
- $$CLUCENEDIR/config/repl_tcslwr.cpp \
|
||||||
|
- $$CLUCENEDIR/config/repl_tcstod.cpp \
|
||||||
|
- $$CLUCENEDIR/config/repl_tcstoll.cpp \
|
||||||
|
- $$CLUCENEDIR/config/repl_tprintf.cpp \
|
||||||
|
- $$CLUCENEDIR/config/threads.cpp \
|
||||||
|
- $$CLUCENEDIR/config/utf8.cpp \
|
||||||
|
- $$CLUCENEDIR/debug/condition.cpp \
|
||||||
|
- $$CLUCENEDIR/debug/error.cpp \
|
||||||
|
- $$CLUCENEDIR/debug/memtracking.cpp \
|
||||||
|
- $$CLUCENEDIR/document/DateField.cpp \
|
||||||
|
- $$CLUCENEDIR/document/Document.cpp \
|
||||||
|
- $$CLUCENEDIR/document/Field.cpp \
|
||||||
|
- $$CLUCENEDIR/index/CompoundFile.cpp \
|
||||||
|
- $$CLUCENEDIR/index/DocumentWriter.cpp \
|
||||||
|
- $$CLUCENEDIR/index/FieldInfos.cpp \
|
||||||
|
- $$CLUCENEDIR/index/FieldsReader.cpp \
|
||||||
|
- $$CLUCENEDIR/index/FieldsWriter.cpp \
|
||||||
|
- $$CLUCENEDIR/index/IndexModifier.cpp \
|
||||||
|
- $$CLUCENEDIR/index/IndexReader.cpp \
|
||||||
|
- $$CLUCENEDIR/index/IndexWriter.cpp \
|
||||||
|
- $$CLUCENEDIR/index/MultiReader.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentInfos.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentMerger.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentReader.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentTermDocs.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentTermEnum.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentTermPositions.cpp \
|
||||||
|
- $$CLUCENEDIR/index/SegmentTermVector.cpp \
|
||||||
|
- $$CLUCENEDIR/index/Term.cpp \
|
||||||
|
- $$CLUCENEDIR/index/TermInfo.cpp \
|
||||||
|
- $$CLUCENEDIR/index/TermInfosReader.cpp \
|
||||||
|
- $$CLUCENEDIR/index/TermInfosWriter.cpp \
|
||||||
|
- $$CLUCENEDIR/index/TermVectorReader.cpp \
|
||||||
|
- $$CLUCENEDIR/index/TermVectorWriter.cpp \
|
||||||
|
- $$CLUCENEDIR/queryParser/Lexer.cpp \
|
||||||
|
- $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
|
||||||
|
- $$CLUCENEDIR/queryParser/QueryParser.cpp \
|
||||||
|
- $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
|
||||||
|
- $$CLUCENEDIR/queryParser/QueryToken.cpp \
|
||||||
|
- $$CLUCENEDIR/queryParser/TokenList.cpp \
|
||||||
|
- $$CLUCENEDIR/search/BooleanQuery.cpp \
|
||||||
|
- $$CLUCENEDIR/search/BooleanScorer.cpp \
|
||||||
|
- $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
|
||||||
|
- $$CLUCENEDIR/search/ChainedFilter.cpp \
|
||||||
|
- $$CLUCENEDIR/search/ConjunctionScorer.cpp \
|
||||||
|
- $$CLUCENEDIR/search/DateFilter.cpp \
|
||||||
|
- $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
|
||||||
|
- $$CLUCENEDIR/search/Explanation.cpp \
|
||||||
|
- $$CLUCENEDIR/search/FieldCache.cpp \
|
||||||
|
- $$CLUCENEDIR/search/FieldCacheImpl.cpp \
|
||||||
|
- $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
|
||||||
|
- $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
|
||||||
|
- $$CLUCENEDIR/search/FilteredTermEnum.cpp \
|
||||||
|
- $$CLUCENEDIR/search/FuzzyQuery.cpp \
|
||||||
|
- $$CLUCENEDIR/search/HitQueue.cpp \
|
||||||
|
- $$CLUCENEDIR/search/Hits.cpp \
|
||||||
|
- $$CLUCENEDIR/search/IndexSearcher.cpp \
|
||||||
|
- $$CLUCENEDIR/search/MultiSearcher.cpp \
|
||||||
|
- $$CLUCENEDIR/search/MultiTermQuery.cpp \
|
||||||
|
- $$CLUCENEDIR/search/PhrasePositions.cpp \
|
||||||
|
- $$CLUCENEDIR/search/PhraseQuery.cpp \
|
||||||
|
- $$CLUCENEDIR/search/PhraseScorer.cpp \
|
||||||
|
- $$CLUCENEDIR/search/PrefixQuery.cpp \
|
||||||
|
- $$CLUCENEDIR/search/QueryFilter.cpp \
|
||||||
|
- $$CLUCENEDIR/search/RangeFilter.cpp \
|
||||||
|
- $$CLUCENEDIR/search/RangeQuery.cpp \
|
||||||
|
- $$CLUCENEDIR/search/SearchHeader.cpp \
|
||||||
|
- $$CLUCENEDIR/search/Similarity.cpp \
|
||||||
|
- $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
|
||||||
|
- $$CLUCENEDIR/search/Sort.cpp \
|
||||||
|
- $$CLUCENEDIR/search/TermQuery.cpp \
|
||||||
|
- $$CLUCENEDIR/search/TermScorer.cpp \
|
||||||
|
- $$CLUCENEDIR/search/WildcardQuery.cpp \
|
||||||
|
- $$CLUCENEDIR/search/WildcardTermEnum.cpp \
|
||||||
|
- $$CLUCENEDIR/store/FSDirectory.cpp \
|
||||||
|
- $$CLUCENEDIR/store/IndexInput.cpp \
|
||||||
|
- $$CLUCENEDIR/store/IndexOutput.cpp \
|
||||||
|
- $$CLUCENEDIR/store/Lock.cpp \
|
||||||
|
- $$CLUCENEDIR/store/MMapInput.cpp \
|
||||||
|
- $$CLUCENEDIR/store/RAMDirectory.cpp \
|
||||||
|
- $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
|
||||||
|
- $$CLUCENEDIR/util/BitSet.cpp \
|
||||||
|
- $$CLUCENEDIR/util/Equators.cpp \
|
||||||
|
- $$CLUCENEDIR/util/FastCharStream.cpp \
|
||||||
|
- $$CLUCENEDIR/util/fileinputstream.cpp \
|
||||||
|
- $$CLUCENEDIR/util/Misc.cpp \
|
||||||
|
- $$CLUCENEDIR/util/Reader.cpp \
|
||||||
|
- $$CLUCENEDIR/util/StringBuffer.cpp \
|
||||||
|
- $$CLUCENEDIR/util/StringIntern.cpp \
|
||||||
|
- $$CLUCENEDIR/util/ThreadLocal.cpp \
|
||||||
|
- $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
|
||||||
|
- $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
|
||||||
|
- $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
|
||||||
|
|
||||||
|
+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
|
||||||
|
+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
|
||||||
|
+#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
|
||||||
|
|
||||||
|
#Header files
|
||||||
|
HEADERS += qclucene_global_p.h \
|
||||||
|
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h
|
||||||
|
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene-config_p.h 2014-09-11 12:48:25.000000000 +0200
|
||||||
|
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene-config_p.h 2014-10-31 23:44:32.368856494 +0100
|
||||||
|
@@ -15,6 +15,8 @@
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
+#error This header must not be included when building against system CLucene.
|
||||||
|
+
|
||||||
|
#ifndef QCLUCENE_CONFIG_P_H
|
||||||
|
#define QCLUCENE_CONFIG_P_H
|
||||||
|
|
||||||
|
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h
|
||||||
|
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qclucene_global_p.h 2014-09-11 12:48:25.000000000 +0200
|
||||||
|
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qclucene_global_p.h 2014-10-31 23:44:32.368856494 +0100
|
||||||
|
@@ -29,20 +29,10 @@
|
||||||
|
// We mean it.
|
||||||
|
//
|
||||||
|
|
||||||
|
-#if !defined(_MSC_VER)
|
||||||
|
-# include "qclucene-config_p.h"
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
#include <QtCore/QChar>
|
||||||
|
#include <QtCore/QString>
|
||||||
|
|
||||||
|
-#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
|
||||||
|
-# if !defined(TCHAR)
|
||||||
|
-# define TCHAR wchar_t
|
||||||
|
-# endif
|
||||||
|
-#else
|
||||||
|
-# include <qt_windows.h>
|
||||||
|
-#endif
|
||||||
|
+#include <CLucene/StdHeader.h>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
@@ -54,52 +44,6 @@
|
||||||
|
# define Q_CLUCENE_EXPORT Q_DECL_IMPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-//
|
||||||
|
-// W A R N I N G
|
||||||
|
-// -------------
|
||||||
|
-//
|
||||||
|
-// adjustments here, need to be done in
|
||||||
|
-// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
|
||||||
|
-//
|
||||||
|
-#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
|
||||||
|
-
|
||||||
|
-#elif !defined(DISABLE_NAMESPACE)
|
||||||
|
-# ifdef QT_NAMESPACE
|
||||||
|
-# define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
|
||||||
|
-# define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
|
||||||
|
-
|
||||||
|
-# define CL_NS_END }}}
|
||||||
|
-# define CL_NS_END2 }}}}
|
||||||
|
-
|
||||||
|
-# define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
|
||||||
|
-# define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
|
||||||
|
-
|
||||||
|
-# define CL_NS(sub) QT_NAMESPACE::lucene::sub
|
||||||
|
-# define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
|
||||||
|
-# else
|
||||||
|
-# define CL_NS_DEF(sub) namespace lucene{ namespace sub{
|
||||||
|
-# define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
|
||||||
|
-
|
||||||
|
-# define CL_NS_END }}
|
||||||
|
-# define CL_NS_END2 }}}
|
||||||
|
-
|
||||||
|
-# define CL_NS_USE(sub) using namespace lucene::sub;
|
||||||
|
-# define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
|
||||||
|
-
|
||||||
|
-# define CL_NS(sub) lucene::sub
|
||||||
|
-# define CL_NS2(sub,sub2) lucene::sub::sub2
|
||||||
|
-# endif
|
||||||
|
-#else
|
||||||
|
-# define CL_NS_DEF(sub)
|
||||||
|
-# define CL_NS_DEF2(sub, sub2)
|
||||||
|
-# define CL_NS_END
|
||||||
|
-# define CL_NS_END2
|
||||||
|
-# define CL_NS_USE(sub)
|
||||||
|
-# define CL_NS_USE2(sub,sub2)
|
||||||
|
-# define CL_NS(sub)
|
||||||
|
-# define CL_NS2(sub,sub2)
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
namespace QtCLuceneHelpers {
|
||||||
|
inline TCHAR* QStringToTChar(const QString &str)
|
||||||
|
{
|
||||||
|
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp
|
||||||
|
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexreader.cpp 2014-09-11 12:48:25.000000000 +0200
|
||||||
|
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexreader.cpp 2014-10-31 23:47:52.184907583 +0100
|
||||||
|
@@ -18,6 +18,8 @@
|
||||||
|
#include "qindexreader_p.h"
|
||||||
|
#include "qclucene_global_p.h"
|
||||||
|
|
||||||
|
+#include <QtCore/QDir>
|
||||||
|
+
|
||||||
|
#include <CLucene.h>
|
||||||
|
#include <CLucene/index/IndexReader.h>
|
||||||
|
|
||||||
|
@@ -59,13 +61,13 @@
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
|
||||||
|
- return IndexReader::isLuceneFile(filename);
|
||||||
|
+ return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool QCLuceneIndexReader::indexExists(const QString &directory)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- return IndexReader::indexExists(directory);
|
||||||
|
+ return IndexReader::indexExists(directory.toLocal8Bit().constData());
|
||||||
|
}
|
||||||
|
|
||||||
|
QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
|
||||||
|
@@ -73,7 +75,7 @@
|
||||||
|
using namespace lucene::index;
|
||||||
|
|
||||||
|
QCLuceneIndexReader indexReader;
|
||||||
|
- indexReader.d->reader = IndexReader::open(path);
|
||||||
|
+ indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
|
||||||
|
|
||||||
|
return indexReader;
|
||||||
|
}
|
||||||
|
@@ -81,25 +83,29 @@
|
||||||
|
void QCLuceneIndexReader::unlock(const QString &path)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- IndexReader::unlock(path);
|
||||||
|
+ IndexReader::unlock(path.toLocal8Bit().constData());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool QCLuceneIndexReader::isLocked(const QString &directory)
|
||||||
|
{
|
||||||
|
+ // The system CLucene fails here if the directory does not exist yet, unlike
|
||||||
|
+ // the bundled one. Work around that.
|
||||||
|
+ QDir::current().mkpath(directory);
|
||||||
|
+
|
||||||
|
using namespace lucene::index;
|
||||||
|
- return IndexReader::isLocked(directory);
|
||||||
|
+ return IndexReader::isLocked(directory.toLocal8Bit().constData());
|
||||||
|
}
|
||||||
|
|
||||||
|
quint64 QCLuceneIndexReader::lastModified(const QString &directory)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- return quint64(IndexReader::lastModified(directory));
|
||||||
|
+ return quint64(IndexReader::lastModified(directory.toLocal8Bit().constData()));
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- return qint64(IndexReader::getCurrentVersion(directory));
|
||||||
|
+ return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void QCLuceneIndexReader::close()
|
||||||
|
@@ -155,7 +161,7 @@
|
||||||
|
void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
|
||||||
|
{
|
||||||
|
TCHAR *fieldName = QStringToTChar(field);
|
||||||
|
- d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
|
||||||
|
+ d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
|
||||||
|
delete [] fieldName;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp
|
||||||
|
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qindexwriter.cpp 2014-09-11 12:48:25.000000000 +0200
|
||||||
|
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qindexwriter.cpp 2014-10-31 23:44:32.369856502 +0100
|
||||||
|
@@ -18,6 +18,8 @@
|
||||||
|
#include "qindexwriter_p.h"
|
||||||
|
#include "qindexreader_p.h"
|
||||||
|
|
||||||
|
+#include <QtCore/QDir>
|
||||||
|
+
|
||||||
|
#include <CLucene.h>
|
||||||
|
#include <CLucene/index/IndexWriter.h>
|
||||||
|
|
||||||
|
@@ -50,7 +52,12 @@
|
||||||
|
: d(new QCLuceneIndexWriterPrivate())
|
||||||
|
, analyzer(analyzer)
|
||||||
|
{
|
||||||
|
- d->writer = new lucene::index::IndexWriter(path,
|
||||||
|
+ // The system CLucene cannot create directories recursively, so do it here.
|
||||||
|
+ // Ignore failure: If it failed, we will get an error from CLucene anyway.
|
||||||
|
+ if (create)
|
||||||
|
+ QDir::current().mkpath(path);
|
||||||
|
+
|
||||||
|
+ d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(),
|
||||||
|
analyzer.d->analyzer, create, closeDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -ur qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp
|
||||||
|
--- qttools-opensource-src-5.3.2/src/assistant/clucene/qsearchable.cpp 2014-09-11 12:48:25.000000000 +0200
|
||||||
|
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/clucene/qsearchable.cpp 2014-10-31 23:44:32.369856502 +0100
|
||||||
|
@@ -95,7 +95,7 @@
|
||||||
|
: QCLuceneSearcher()
|
||||||
|
{
|
||||||
|
lucene::search::IndexSearcher *searcher =
|
||||||
|
- new lucene::search::IndexSearcher(path);
|
||||||
|
+ new lucene::search::IndexSearcher(path.toLocal8Bit().constData());
|
||||||
|
|
||||||
|
reader.d->reader = searcher->getReader();
|
||||||
|
reader.d->deleteCLuceneIndexReader = false;
|
||||||
|
diff -ur qttools-opensource-src-5.3.2/src/assistant/help/help.pro qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro
|
||||||
|
--- qttools-opensource-src-5.3.2/src/assistant/help/help.pro 2014-09-11 12:48:25.000000000 +0200
|
||||||
|
+++ qttools-opensource-src-5.3.2-system-clucene/src/assistant/help/help.pro 2014-10-31 23:44:32.369856502 +0100
|
||||||
|
@@ -34,6 +34,7 @@
|
||||||
|
qhelp_global.cpp
|
||||||
|
|
||||||
|
# access to clucene
|
||||||
|
+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
|
||||||
|
SOURCES += qhelpsearchindexwriter_clucene.cpp \
|
||||||
|
qhelpsearchindexreader_clucene.cpp
|
||||||
|
HEADERS += qhelpenginecore.h \
|
||||||
27
qttools-opensource-src-5.5.0-qmake-qt5.patch
Normal file
27
qttools-opensource-src-5.5.0-qmake-qt5.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
diff -up qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp
|
||||||
|
--- qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 2015-06-29 15:13:45.000000000 -0500
|
||||||
|
+++ qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp 2015-07-16 10:23:49.664773033 -0500
|
||||||
|
@@ -310,9 +310,9 @@ int main(int argc, char **argv)
|
||||||
|
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
|
||||||
|
if (option.qmake_abslocation.isEmpty())
|
||||||
|
#ifdef QT_BOOTSTRAPPED
|
||||||
|
- option.qmake_abslocation = binDir + QLatin1String("/qmake");
|
||||||
|
+ option.qmake_abslocation = binDir + QLatin1String("/qmake-qt5");
|
||||||
|
#else
|
||||||
|
- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
|
||||||
|
+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5");
|
||||||
|
#endif
|
||||||
|
option.initProperties();
|
||||||
|
QMakeVfs vfs;
|
||||||
|
diff -up qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp
|
||||||
|
--- qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 2015-06-29 15:13:46.000000000 -0500
|
||||||
|
+++ qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp 2015-07-16 10:23:49.665773055 -0500
|
||||||
|
@@ -1048,7 +1048,7 @@ int main(int argc, char **argv)
|
||||||
|
ProFileGlobals option;
|
||||||
|
option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
|
||||||
|
if (option.qmake_abslocation.isEmpty())
|
||||||
|
- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake");
|
||||||
|
+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5");
|
||||||
|
option.debugLevel = proDebug;
|
||||||
|
option.initProperties();
|
||||||
|
option.setCommandLineArguments(QDir::currentPath(),
|
||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (qttools-everywhere-opensource-src-5.15.6.tar.xz) = 8539930c3facb4a2b43ce7f76f461181489952d79c4d9e11c8acf6b342c3466f5868adcef1a1bfdfa9c142217c0e43853c3297fc0701030c63d0b349e0767297
|
SHA512 (qttools-everywhere-src-5.12.4.tar.xz) = 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
qttools-everywhere-src
|
|
||||||
Loading…
Reference in New Issue
Block a user