diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-01-14 23:01:53 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-01-14 23:01:53 +0000 |
| commit | 43bee095fc9d070a8deeb7aff9f11130ebdd4383 (patch) | |
| tree | 034e796536551e69da65438867854f38682dea35 /devel/qtcreator/files/patch-git-4ee78bf | |
| parent | Add patch for CVE-2013-7252 (CBC encryption handling bug). (diff) | |
Update to 3.3.0.
A lot of patches can be removed, and the only ones left are backported from
upstream. The port now uses Qt5 instead of Qt4, and should finally be
MAKE_JOBS_SAFE.
Other smaller changes:
* The paths for gnuplot and ant in the sed calls in the Makefile were wrong,
and have been fixed.
* There was no explanation for why "CONFIG+=configure" was required in
QMAKE_ARGS, so it has been removed.
Huge thanks to Tobias Berner for working on this and following my picky
suggestions!
PR: 196167
Submitted by: Tobias C. Berner <tcberner@gmail.com>
Notes
Notes:
svn path=/head/; revision=377057
Diffstat (limited to 'devel/qtcreator/files/patch-git-4ee78bf')
| -rw-r--r-- | devel/qtcreator/files/patch-git-4ee78bf | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/devel/qtcreator/files/patch-git-4ee78bf b/devel/qtcreator/files/patch-git-4ee78bf new file mode 100644 index 000000000000..3ac95e1dda10 --- /dev/null +++ b/devel/qtcreator/files/patch-git-4ee78bf @@ -0,0 +1,25 @@ +From 4ee78bfb8a526f250184958fda717032b47a5e96 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Tue, 30 Dec 2014 16:33:15 +0200 +Subject: [PATCH] buildoutputparser: Respect $QTC_PREFIX. + +Do what all other targets already do and take $$QTC_PREFIX into +consideration when setting the target's installation path. + +Change-Id: I6ca87d36b345ec256518fe2d349e58d213f5c6d5 +Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> +Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> + + +--- src/tools/buildoutputparser/buildoutputparser.pro ++++ src/tools/buildoutputparser/buildoutputparser.pro +@@ -13,7 +13,7 @@ include(../../rpath.pri) + win32|equals(TEST, 1):DEFINES += HAS_MSVC_PARSER + + DESTDIR = $$IDE_BIN_PATH +-target.path = /bin ++target.path = $$QTC_PREFIX/bin + INSTALLS += target + + SOURCES = \ + |