7169baff88
- Added patches from upstream: Fix-Meta-shortcuts-on-XCB.patch (qtbug#43572), Fix-detection-of-GCC5.patch, Fix-physical-DPI-and-size-for-rotated-screens-on-X11.patch (qtbug#43688), Fix-typo-in-Qt5CoreMacroscmake.patch, Make-sure-theres-a-scene-before-using-it.patch (qtbug#44509), Multi-screen-DPI-support-for-X11.patch (qtbug#43713), QSystemTrayIcon-handle-submenus-correctly.patch, Update-mouse-buttons-from-MotionNotify-events.patch (qtbug#32609, qtbug#35065, qtbug#43776, qtbug#44166, qtbug#44231), X11-devicePixelRatio-screen-mapping-fix.patch (qtbug#43713) and xcb-Dont-return-0-from-QXcbKeyboard-possibleKeys.patch (qtcreatorbug#9589) OBS-URL: https://build.opensuse.org/request/show/286573 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=37
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From: Aleix Pol <aleixpol@kde.org>
|
|
Date: Mon, 22 Dec 2014 15:34:54 +0000
|
|
Subject: Fix typo in Qt5CoreMacros.cmake
|
|
X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqtbase.git&a=commitdiff&h=c63bb90ac7224927b56197d80252c79d01ff3b6f
|
|
---
|
|
Fix typo in Qt5CoreMacros.cmake
|
|
|
|
According to the documentation, the argument is called COPYONLY instead
|
|
of COPY_ONLY.
|
|
Fixes warning and ensures it works properly.
|
|
|
|
Change-Id: I643f5ea808aaaf94c3ee666ec39485e84ed38df1
|
|
Reviewed-by: Vishesh Handa <vhanda@kde.org>
|
|
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|
---
|
|
|
|
|
|
--- a/src/corelib/Qt5CoreMacros.cmake
|
|
+++ b/src/corelib/Qt5CoreMacros.cmake
|
|
@@ -221,7 +221,7 @@
|
|
# let's make a configured file and add it as a dependency so cmake is run
|
|
# again when dependencies need to be recomputed.
|
|
qt5_make_output_file("${infile}" "" "qrc.depends" out_depends)
|
|
- configure_file("${infile}" "${out_depends}" COPY_ONLY)
|
|
+ configure_file("${infile}" "${out_depends}" COPYONLY)
|
|
else()
|
|
# The .qrc file does not exist (yet). Let's add a dependency and hope
|
|
# that it will be generated later
|