packages/qt5-qttools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:389dfb31bf5f5f4f1a3c896c8c61b8aded92a3fd
Branches Tags
packages:main
..
compare: packages:2776e63d66b081c5d86ff0f113ab4b8186703949
Branches Tags
packages:main

No commits in common. "389dfb31bf5f5f4f1a3c896c8c61b8aded92a3fd" and "2776e63d66b081c5d86ff0f113ab4b8186703949" have entirely different histories.
389dfb31bf ... 2776e63d66

12 changed files with 61 additions and 252 deletions
Show Stats Expand all files Collapse all files

74
0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
View File

@ -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
}

37
0001-modify-lupdate-qt5-run-error.patch
View File

@ -1,37 +0,0 @@
From 1feda57a8a7a7dc2a459d9b3e77fcee76928891c Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
Date: Fri, 11 Mar 2022 15:32:43 +0800
Subject: [PATCH] modify lupdate-qt5 run error
---
src/linguist/lupdate-pro/main.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/linguist/lupdate-pro/main.cpp b/src/linguist/lupdate-pro/main.cpp
index 1ce039c..1a62939 100644
--- a/src/linguist/lupdate-pro/main.cpp
+++ b/src/linguist/lupdate-pro/main.cpp
@@ -139,6 +139,20 @@ int main(int argc, char **argv)
} else if (isProOrPriFile(arg)) {
lprodumpOptions << arg;
hasProFiles = true;
+ }else if (arg.startsWith(QLatin1String("@"))) {
+ QFile lstFile(arg.mid(1));
+ if (!lstFile.open(QIODevice::ReadOnly)) {
+ printErr(LU::tr("lupdate-pro error: List file '%1' is not readable.\n")
+ .arg(lstFile.fileName()));
+ return 1;
+ }
+ while (!lstFile.atEnd()) {
+ QString lineContent = QString::fromLocal8Bit(lstFile.readLine().trimmed());
+ if (isProOrPriFile(lineContent)) {
+ lprodumpOptions << lineContent;
+ hasProFiles = true;
+ }
+ }
} else {
lupdateOptions << arg;
}
--
2.33.0

5
assistant.desktop
View File

@ -1,10 +1,7 @@
[Desktop Entry] [Desktop Entry]
Categories=Qt;Development;Documentation;
Name=Qt5 Assistant Name=Qt5 Assistant
Name[zh_CN]=Qt5助手
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;

5
designer.desktop
View File

@ -1,11 +1,8 @@
[Desktop Entry] [Desktop Entry]
Categories=Qt;Development;
Name=Qt5 Designer Name=Qt5 Designer
Name[zh_CN]=Qt5设计
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;

5
linguist.desktop
View File

@ -1,11 +1,8 @@
[Desktop Entry] [Desktop Entry]
Categories=Qt;Development;
Name=Qt5 Linguist Name=Qt5 Linguist
Name[zh_CN]=Qt5语言工具
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;

5
qdbusviewer.desktop
View File

@ -1,11 +1,8 @@
[Desktop Entry] [Desktop Entry]
Categories=Qt;Development;Debugger;
Name=Qt5 QDbusViewer Name=Qt5 QDbusViewer
Name[zh_CN]=Qt5 D-Bus调试
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;

91
qt5-qttools.spec
View File

@ -1,24 +1,19 @@
Name: qt5-qttools Name: qt5-qttools
Version: 5.15.2 Version: 5.11.1
Release: 4 Release: 4
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
%global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/archive/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz
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
Patch0: qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch Patch0001: qttools-opensource-src-5.5.0-qmake-qt5.patch
Patch1: qttools-opensource-src-5.7-add-libatomic.patch
Patch2: 0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
Patch3: 0001-modify-lupdate-qt5-run-error.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} qt5-qtbase-static >= %{version} BuildRequires: qt5-qtbase-private-devel qt5-qtbase-devel >= %{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}}
@ -32,58 +27,51 @@ 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
%setup -q -n qttools-everywhere-src-%{version} %autosetup -n qttools-everywhere-src-%{version} -p1
%patch0 -p1 -b ..runqttools-with-qt5-suffix.patch
%ifarch %{mips32}
%patch1 -p1 -b .libatomic
%endif
%patch2 -p1 -b .libclang-cpp
%patch3 -p1
%build %build
%{qmake_qt5} %{qmake_qt5}
@ -110,7 +98,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|lprodump|pixeltool|qcollectiongenerator|qdbus \ assistant|designer|lconvert|linguist|lrelease|lupdate|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
@ -185,9 +173,7 @@ 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*
@ -197,7 +183,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*
@ -208,11 +194,9 @@ 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
@ -227,13 +211,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*/
@ -244,14 +228,10 @@ 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_*
@ -260,21 +240,6 @@ cd -
%changelog %changelog
* Wed Mar 30 2022 ouyangminxiang <ouyangminxiang@kylinsec.com.cn> - 5.15.2-4
- Add Chinese translation
* Fri Mar 11 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.15.2-3
- modify lupdate-qt5 run error
* Tue Feb 22 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.15.2-2
- modify lupdate-qt5 run error
* Wed Oct 13 2021 pei-jiankang <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
- Fix Source0
* Fri Jan 10 2020 zhujunhao <zhujunhao5@huawei.com> - 5.11.1-4 * Fri Jan 10 2020 zhujunhao <zhujunhao5@huawei.com> - 5.11.1-4
- change the url to valid address - change the url to valid address

4
qt5-qttools.yaml
View File

@ -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
separator: "." seperator: .

BIN
qttools-everywhere-src-5.15.2.tar.xz → qttools-everywhere-src-5.11.1.tar.xz
View File

Binary file not shown.

49
qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch
View File

@ -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;
}

27
qttools-opensource-src-5.5.0-qmake-qt5.patch Normal file
View 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(),

11
qttools-opensource-src-5.7-add-libatomic.patch
View File

@ -1,11 +0,0 @@
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