!10 update to upstream version 5.15.2
Merge pull request !10 from pei-jiankang/master
This commit is contained in:
commit
abc113770a
@ -0,0 +1,74 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
@ -1,7 +1,9 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Categories=Qt;Development;Documentation;
|
|
||||||
Name=Qt5 Assistant
|
Name=Qt5 Assistant
|
||||||
|
GenericName=Documentation viewer
|
||||||
|
Comment=Shows Qt5 documentation and examples
|
||||||
Exec=assistant-qt5
|
Exec=assistant-qt5
|
||||||
Icon=assistant-qt5
|
Icon=assistant-qt5
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
|
Categories=Qt;Development;Documentation;
|
||||||
|
|||||||
@ -1,8 +1,10 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Categories=Qt;Development;
|
|
||||||
Name=Qt5 Designer
|
Name=Qt5 Designer
|
||||||
|
GenericName=Interface Designer
|
||||||
|
Comment=Design GUIs for Qt5 applications
|
||||||
Exec=designer-qt5
|
Exec=designer-qt5
|
||||||
Icon=designer-qt5
|
Icon=designer-qt5
|
||||||
MimeType=application/x-designer;
|
MimeType=application/x-designer;
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
|
Categories=Qt;Development;
|
||||||
|
|||||||
@ -1,8 +1,10 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Categories=Qt;Development;
|
|
||||||
Name=Qt5 Linguist
|
Name=Qt5 Linguist
|
||||||
|
GenericName=Translation tool
|
||||||
|
Comment=Add translations to Qt5 applications
|
||||||
Exec=linguist-qt5
|
Exec=linguist-qt5
|
||||||
Icon=linguist-qt5
|
Icon=linguist-qt5
|
||||||
MimeType=text/vnd.trolltech.linguist;application/x-linguist;
|
MimeType=text/vnd.trolltech.linguist;application/x-linguist;
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
|
Categories=Qt;Development;
|
||||||
|
|||||||
@ -1,8 +1,10 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Categories=Qt;Development;Debugger;
|
|
||||||
Name=Qt5 QDbusViewer
|
Name=Qt5 QDbusViewer
|
||||||
|
GenericName=D-Bus Debugger
|
||||||
|
Comment=Debug D-Bus applications
|
||||||
Exec=qdbusviewer-qt5
|
Exec=qdbusviewer-qt5
|
||||||
Icon=qdbusviewer-qt5
|
Icon=qdbusviewer-qt5
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
|
Categories=Qt;Development;Debugger;
|
||||||
|
|
||||||
|
|||||||
@ -1,19 +1,23 @@
|
|||||||
Name: qt5-qttools
|
Name: qt5-qttools
|
||||||
Version: 5.11.1
|
Version: 5.15.2
|
||||||
Release: 5
|
Release: 1
|
||||||
Summary: Qt5 QtTool module
|
Summary: Qt5 QtTool module
|
||||||
License: LGPLv3 or LGPLv2
|
License: LGPLv3 or LGPLv2
|
||||||
Url: http://www.qt.io
|
Url: http://www.qt.io
|
||||||
Source0: https://download.qt.io/new_archive/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
|
%global majmin %(echo %{version} | cut -d. -f1-2)
|
||||||
|
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qttools-everywhere-src-%{version}.tar.xz
|
||||||
Source1: assistant.desktop
|
Source1: assistant.desktop
|
||||||
Source2: designer.desktop
|
Source2: designer.desktop
|
||||||
Source3: linguist.desktop
|
Source3: linguist.desktop
|
||||||
Source4: qdbusviewer.desktop
|
Source4: qdbusviewer.desktop
|
||||||
|
|
||||||
Patch0001: qttools-opensource-src-5.5.0-qmake-qt5.patch
|
Patch0: qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch
|
||||||
|
Patch1: qttools-opensource-src-5.7-add-libatomic.patch
|
||||||
|
Patch2: 0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
|
||||||
|
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: cmake desktop-file-utils /usr/bin/file qt5-rpm-macros >= %{version}
|
BuildRequires: cmake desktop-file-utils /usr/bin/file qt5-rpm-macros >= %{version}
|
||||||
BuildRequires: qt5-qtbase-private-devel qt5-qtbase-devel >= %{version}
|
BuildRequires: qt5-qtbase-private-devel qt5-qtbase-devel >= %{version} qt5-qtbase-static >= %{version}
|
||||||
BuildRequires: clang-devel llvm-devel qt5-qtdeclarative-devel >= %{version} pkgconfig(Qt5Qml)
|
BuildRequires: clang-devel llvm-devel qt5-qtdeclarative-devel >= %{version} pkgconfig(Qt5Qml)
|
||||||
%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
|
%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
|
||||||
|
|
||||||
@ -27,50 +31,57 @@ Conflicts: qt5-tools < 5.4.0-0.2
|
|||||||
This package contains Qt5 QtTool module core files.
|
This package contains Qt5 QtTool module core files.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: %{name} development files
|
Summary: %{name} development files
|
||||||
Requires: %{name} = %{version}-%{release} %{name}-libs-designer = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release} %{name}-libs-designer = %{version}-%{release}
|
||||||
Requires: %{name}-libs-designercomponents = %{version}-%{release} %{name}-libs-help = %{version}-%{release}
|
Requires: %{name}-libs-designercomponents = %{version}-%{release} %{name}-libs-help = %{version}-%{release}
|
||||||
Requires: qt5-doctools = %{version}-%{release} qt5-designer = %{version}-%{release}
|
Requires: qt5-doctools = %{version}-%{release} qt5-designer = %{version}-%{release}
|
||||||
Requires: qt5-linguist = %{version}-%{release} qt5-qtbase-devel
|
Requires: qt5-linguist = %{version}-%{release} qt5-qtbase-devel
|
||||||
Provides: qt5-qttools-static = %{version}-%{release} qt5-qttools-examples = %{version}-%{release}
|
Provides: qt5-qttools-static = %{version}-%{release} qt5-qttools-examples = %{version}-%{release}
|
||||||
Obsoletes: qt5-qttools-static < %{version}-%{release} qt5-qttools-examples < %{version}-%{release}
|
Obsoletes: qt5-qttools-static < %{version}-%{release} qt5-qttools-examples < %{version}-%{release}
|
||||||
%description devel
|
%description devel
|
||||||
The devel package contains libraries and header files for developing applications that use %{name}.
|
The devel package contains libraries and header files for developing applications that use %{name}.
|
||||||
|
|
||||||
%package -n qt5-assistant
|
%package -n qt5-assistant
|
||||||
Summary: Qt5 Documentation browser
|
Summary: Qt5 Documentation browser
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
%description -n qt5-assistant
|
%description -n qt5-assistant
|
||||||
This package contains Qt5 Documentation browser files.
|
This package contains Qt5 Documentation browser files.
|
||||||
|
|
||||||
%package -n qt5-designer
|
%package -n qt5-designer
|
||||||
Summary: Qt5 Design GUI
|
Summary: Qt5 Design GUI
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
%description -n qt5-designer
|
%description -n qt5-designer
|
||||||
This package contains Qt5 Design GUI files.
|
This package contains Qt5 Design GUI files.
|
||||||
|
|
||||||
%package -n qt5-linguist
|
%package -n qt5-linguist
|
||||||
Summary: Tools for Qt5 Linguist
|
Summary: Tools for Qt5 Linguist
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
%description -n qt5-linguist
|
%description -n qt5-linguist
|
||||||
This package contains tools to add translations to Qt5 applications.
|
This package contains tools to add translations to Qt5 applications.
|
||||||
|
|
||||||
%package -n qt5-qdbusviewer
|
%package -n qt5-qdbusviewer
|
||||||
Summary: Qt5 D-Bus debugger and viewer
|
Summary: Qt5 D-Bus debugger and viewer
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
%{?_qt5:Requires: %{_qt5} >= %{_qt5_version}}
|
%{?_qt5:Requires: %{_qt5} >= %{_qt5_version}}
|
||||||
%description -n qt5-qdbusviewer
|
%description -n qt5-qdbusviewer
|
||||||
This package is created for debugging D-Bus objects.
|
This package is created for debugging D-Bus objects.
|
||||||
|
|
||||||
%package -n qt5-doctools
|
%package -n qt5-doctools
|
||||||
Summary: Tools for Qt5 doc
|
Summary: Tools for Qt5 doc
|
||||||
Provides: qt5-qdoc = %{version} qt5-qhelpgenerator = %{version} qt5-qtattributionsscanner = %{version}
|
Provides: qt5-qdoc = %{version} qt5-qhelpgenerator = %{version} qt5-qtattributionsscanner = %{version}
|
||||||
Obsoletes: qt5-qdoc < 5.8.0 qt5-qhelpgenerator < 5.8.0 qt5-qtattributionsscanner < 5.8.0
|
Obsoletes: qt5-qdoc < 5.8.0 qt5-qhelpgenerator < 5.8.0 qt5-qtattributionsscanner < 5.8.0
|
||||||
|
Requires: qt5-qtattributionsscanner = %{version}
|
||||||
|
|
||||||
%description -n qt5-doctools
|
%description -n qt5-doctools
|
||||||
This package contains tools for Qt5 doc.
|
This package contains tools for Qt5 doc.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n qttools-everywhere-src-%{version} -p1
|
%setup -q -n qttools-everywhere-src-%{version}
|
||||||
|
%patch0 -p1 -b ..runqttools-with-qt5-suffix.patch
|
||||||
|
%ifarch %{mips32}
|
||||||
|
%patch1 -p1 -b .libatomic
|
||||||
|
%endif
|
||||||
|
%patch2 -p1 -b .libclang-cpp
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -98,7 +109,7 @@ mkdir %{buildroot}%{_bindir}
|
|||||||
cd %{buildroot}%{_qt5_bindir}
|
cd %{buildroot}%{_qt5_bindir}
|
||||||
for x in * ; do
|
for x in * ; do
|
||||||
case "${x}" in
|
case "${x}" in
|
||||||
assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus \
|
assistant|designer|lconvert|linguist|lrelease|lupdate|lprodump|pixeltool|qcollectiongenerator|qdbus \
|
||||||
|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
|
|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
|
||||||
ln -v ${x} %{buildroot}%{_bindir}/${x}-qt5
|
ln -v ${x} %{buildroot}%{_bindir}/${x}-qt5
|
||||||
ln -sv ${x} ${x}-qt5
|
ln -sv ${x} ${x}-qt5
|
||||||
@ -173,7 +184,9 @@ cd -
|
|||||||
%files -n qt5-doctools
|
%files -n qt5-doctools
|
||||||
%{_bindir}/qdoc*
|
%{_bindir}/qdoc*
|
||||||
%{_qt5_bindir}/qdoc*
|
%{_qt5_bindir}/qdoc*
|
||||||
|
%{_bindir}/qdistancefieldgenerator*
|
||||||
%{_bindir}/qhelpgenerator*
|
%{_bindir}/qhelpgenerator*
|
||||||
|
%{_qt5_bindir}/qdistancefieldgenerator*
|
||||||
%{_qt5_bindir}/qhelpgenerator*
|
%{_qt5_bindir}/qhelpgenerator*
|
||||||
%{_bindir}/qtattributionsscanner-qt5
|
%{_bindir}/qtattributionsscanner-qt5
|
||||||
%{_qt5_bindir}/qtattributionsscanner*
|
%{_qt5_bindir}/qtattributionsscanner*
|
||||||
@ -183,7 +196,7 @@ cd -
|
|||||||
%{_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
|
||||||
|
|
||||||
%files -n qt5-linguist
|
%files -n qt5-linguist
|
||||||
%{_bindir}/linguist*
|
%{_bindir}/linguist*
|
||||||
@ -194,9 +207,11 @@ cd -
|
|||||||
%{_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*
|
||||||
%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/
|
%dir %{_qt5_libdir}/cmake/Qt5LinguistTools/
|
||||||
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
|
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
|
||||||
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
|
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
|
||||||
@ -211,13 +226,13 @@ cd -
|
|||||||
%files devel
|
%files devel
|
||||||
%{_bindir}/pixeltool*
|
%{_bindir}/pixeltool*
|
||||||
%{_bindir}/qcollectiongenerator*
|
%{_bindir}/qcollectiongenerator*
|
||||||
%{_bindir}/qhelpconverter*
|
#{_bindir}/qhelpconverter*
|
||||||
%{_bindir}/qtdiag*
|
%{_bindir}/qtdiag*
|
||||||
%{_bindir}/qtplugininfo*
|
%{_bindir}/qtplugininfo*
|
||||||
%{_qt5_bindir}/pixeltool*
|
%{_qt5_bindir}/pixeltool*
|
||||||
%{_qt5_bindir}/qtdiag*
|
%{_qt5_bindir}/qtdiag*
|
||||||
%{_qt5_bindir}/qcollectiongenerator*
|
%{_qt5_bindir}/qcollectiongenerator*
|
||||||
%{_qt5_bindir}/qhelpconverter*
|
#{_qt5_bindir}/qhelpconverter*
|
||||||
%{_qt5_bindir}/qtplugininfo*
|
%{_qt5_bindir}/qtplugininfo*
|
||||||
%{_qt5_libdir}/pkgconfig/Qt5*.pc
|
%{_qt5_libdir}/pkgconfig/Qt5*.pc
|
||||||
%{_qt5_headerdir}/Qt*/
|
%{_qt5_headerdir}/Qt*/
|
||||||
@ -228,10 +243,14 @@ cd -
|
|||||||
%{_qt5_libdir}/libQt5Help.so
|
%{_qt5_libdir}/libQt5Help.so
|
||||||
%{_qt5_libdir}/libQt5UiTools.*a
|
%{_qt5_libdir}/libQt5UiTools.*a
|
||||||
%{_qt5_libdir}/libQt5UiTools.prl
|
%{_qt5_libdir}/libQt5UiTools.prl
|
||||||
|
%{_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}/cmake/Qt5AttributionsScannerTools/
|
||||||
|
%{_qt5_libdir}/cmake/Qt5DocTools/
|
||||||
%{_qt5_libdir}/cmake/Qt5UiTools/
|
%{_qt5_libdir}/cmake/Qt5UiTools/
|
||||||
%dir %{_qt5_libdir}/cmake/Qt5Designer
|
%dir %{_qt5_libdir}/cmake/Qt5Designer
|
||||||
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_*
|
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_*
|
||||||
@ -240,6 +259,9 @@ cd -
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
|
||||||
|
- update to upstream version 5.15.2
|
||||||
|
|
||||||
* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-5
|
* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-5
|
||||||
- Fix Source0
|
- Fix Source0
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
version_control: git
|
version_control: git
|
||||||
src_repo: https://code.qt.io/qt/qttools.git
|
src_repo: https://code.qt.io/qt/qttools.git
|
||||||
tag_prefix: ^v
|
tag_prefix: "^v"
|
||||||
seperator: .
|
separator: "."
|
||||||
|
|||||||
Binary file not shown.
@ -0,0 +1,49 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@ -1,27 +0,0 @@
|
|||||||
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(),
|
|
||||||
11
qttools-opensource-src-5.7-add-libatomic.patch
Normal file
11
qttools-opensource-src-5.7-add-libatomic.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -urp qttools-opensource-src-5.6.0-beta1/src/qtdiag/qtdiag.pro q/src/qtdiag/qtdiag.pro
|
||||||
|
--- qttools-opensource-src-5.6.0-beta1/src/qtdiag/qtdiag.pro 2015-10-30 11:48:01.000000000 +0100
|
||||||
|
+++ q/src/qtdiag/qtdiag.pro 2016-04-30 08:45:22.099054040 +0200
|
||||||
|
@@ -2,6 +2,7 @@ load(qt_app)
|
||||||
|
|
||||||
|
CONFIG += console
|
||||||
|
QT += core-private gui-private
|
||||||
|
+LIBS += -latomic
|
||||||
|
|
||||||
|
qtHaveModule(network) {
|
||||||
|
QT += network
|
||||||
Loading…
x
Reference in New Issue
Block a user