diff options
Diffstat (limited to 'dev-qt/qtcore/files')
8 files changed, 0 insertions, 350 deletions
diff --git a/dev-qt/qtcore/files/CVE-2013-0254.patch b/dev-qt/qtcore/files/CVE-2013-0254.patch deleted file mode 100644 index 48cc05f..0000000 --- a/dev-qt/qtcore/files/CVE-2013-0254.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Sat, 22 Dec 2012 08:32:12 -0800 -Subject: [PATCH] Change all shmget calls to user-only memory - -Drop the read and write permissions for group and other users in the -system. - -Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 -(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) -Reviewed-by: Richard J. Moore <rich@kde.org> ---- - src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- - src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- - -diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp -index 20d76e3..4cf3acf 100644 ---- a/src/corelib/kernel/qsharedmemory_unix.cpp -+++ b/src/corelib/kernel/qsharedmemory_unix.cpp -@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) - } - - // create -- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { -+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { - QString function = QLatin1String("QSharedMemory::create"); - switch (errno) { - case EINVAL: -@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) - { - #ifndef QT_POSIX_IPC - // grab the shared memory segment id -- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); -+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); - if (-1 == id) { - setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); - return false; -@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() - size = 0; - - // Get the number of current attachments -- int id = shmget(unix_key, 0, 0444); -+ int id = shmget(unix_key, 0, 0400); - cleanHandle(); - - struct shmid_ds shmid_ds; -diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp -index fad9acc..e77456b 100644 ---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp -+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp -@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) - } - - // Get semaphore -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); - if (-1 == semaphore) { - if (errno == EEXIST) -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); - if (-1 == semaphore) { - setErrorString(QLatin1String("QSystemSemaphore::handle")); - cleanHandle(); --- -1.7.1 - diff --git a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch b/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch deleted file mode 100644 index c2245cc..0000000 --- a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001 -From: Peter Hartmann <phartmann@rim.com> -Date: Fri, 4 Jan 2013 11:06:14 +0100 -Subject: [PATCH 80/90] SSL certificates: blacklist mis-issued Turktrust - certificates - -Those certificates have erroneously set the CA attribute to true, -meaning everybody in possesion of their keys can issue certificates on -their own. - -backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase - -Task-number: QTBUG-28937 -Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 -Reviewed-by: Richard J. Moore <rich@kde.org> ---- - src/network/ssl/qsslcertificate.cpp | 3 +++ - ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++++ - .../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++++ - 3 files changed, 58 insertions(+) - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem - -diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp -index 038187f..37799d1 100644 ---- a/src/network/ssl/qsslcertificate.cpp -+++ b/src/network/ssl/qsslcertificate.cpp -@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = { - - "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust - "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust -+ -+ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate -+ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate - 0 - }; - -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -new file mode 100644 -index 0000000..33f2ef4 ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -@@ -0,0 +1,24 @@ -+-----BEGIN CERTIFICATE----- -+MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow -+gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr -+b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz -+bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA -+a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -+CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5 -+GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R -+rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa -+tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r -+Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF -+9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw -+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K -+JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l -+zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA -+l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8 -+3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp -+Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC -+pWfGWA== -+-----END CERTIFICATE----- -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -new file mode 100644 -index 0000000..e9d048f ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -@@ -0,0 +1,31 @@ -+-----BEGIN CERTIFICATE----- -+MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow -+bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB -+MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE -+AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -+v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V -+50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF -+Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO -+wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q -+blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N -+Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS -+29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G -+A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF -+BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF -+MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t -+LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd -+MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy -+dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz -+aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy -+a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn -+vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV -+gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj -+7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU -+h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1 -+Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I -+hQ== -+-----END CERTIFICATE----- --- -1.8.1 - diff --git a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch b/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch deleted file mode 100644 index d59ac49..0000000 --- a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 03e96961b0f4fc2c290271c6e50a11aa334a40ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org> -Date: Sun, 3 Feb 2013 23:07:07 -0500 -Subject: [PATCH] Fix call to QMetaObject::metaCall from updateProperty - -Create an array of arguments in the same way -QMetaObject::write does - -Task-number: QTBUG-29082 -Change-Id: I4ea5ab5dcd6b55cf0a127b855b5aac27a9d4a305 ---- - src/corelib/animation/qpropertyanimation.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp -index dcf779a..9869d7e 100644 ---- a/src/corelib/animation/qpropertyanimation.cpp -+++ b/src/corelib/animation/qpropertyanimation.cpp -@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue) - - if (newValue.userType() == propertyType) { - //no conversion is needed, we directly call the QMetaObject::metacall -- void *data = const_cast<void*>(newValue.constData()); -- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); -+ //check QMetaProperty::write for an explanation of these -+ int status = -1; -+ int flags = 0; -+ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags }; -+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); - } else { - targetValue->setProperty(propertyName.constData(), newValue); - } --- -1.8.1.2 - diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch deleted file mode 100644 index fa82334..0000000 --- a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600 -+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600 -@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv) - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ -+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829 -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; -+ - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch b/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch deleted file mode 100644 index 8d92ca9..0000000 --- a/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp 2012-05-04 18:45:34.122912347 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp 2012-05-04 18:51:28.267484929 +0200 -@@ -187,6 +187,7 @@ - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // Gentoo bug #401551 - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/dev-qt/qtcore/files/qt-ccache.patch b/dev-qt/qtcore/files/qt-ccache.patch deleted file mode 100644 index 5afee16..0000000 --- a/dev-qt/qtcore/files/qt-ccache.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- src/tools/moc/moc.cpp.orig 2012-04-26 21:46:08.000000000 +0200 -+++ src/tools/moc/moc.cpp 2012-08-12 12:31:12.411828701 +0200 -@@ -777,8 +777,8 @@ - fn = filename.mid(i); - fprintf(out, "/****************************************************************************\n" - "** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn); -- fprintf(out, "** Created: %s\n" -- "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , dstr.data(), mocOutputRevision, QT_VERSION_STR); -+ fprintf(out, "** Created\n" -+ "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR); - fprintf(out, "** WARNING! All changes made in this file will be lost!\n" - "*****************************************************************************/\n\n"); - ---- src/tools/uic/uic.cpp.orig 2012-04-26 21:46:08.000000000 +0200 -+++ src/tools/uic/uic.cpp 2012-08-12 12:35:27.502830993 +0200 -@@ -139,7 +139,7 @@ - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** Created" << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; ---- src/tools/rcc/rcc.cpp.orig 2012-04-26 21:46:08.000000000 +0200 -+++ src/tools/rcc/rcc.cpp 2012-08-12 12:38:55.148832886 +0200 -@@ -732,7 +732,6 @@ - writeString("** Resource object code\n"); - writeString("**\n"); - writeString("** Created: "); -- writeByteArray(QDateTime::currentDateTime().toString().toLatin1()); - writeString("\n** by: The Resource Compiler for Qt version "); - writeByteArray(QT_VERSION_STR); - writeString("\n**\n"); diff --git a/dev-qt/qtcore/files/qt-cxxflags.patch b/dev-qt/qtcore/files/qt-cxxflags.patch deleted file mode 100644 index 2fa0ce6..0000000 --- a/dev-qt/qtcore/files/qt-cxxflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- mkspecs/common/gcc-base.conf.orig 2012-04-26 21:45:52.000000000 +0200 -+++ mkspecs/common/gcc-base.conf 2012-07-23 21:14:35.495641264 +0200 -@@ -35,7 +35,7 @@ - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += -O3 - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC ---- mkspecs/common/g++-base.conf.orig 2012-04-26 21:45:52.000000000 +0200 -+++ mkspecs/common/g++-base.conf 2012-07-23 21:15:40.937641856 +0200 -@@ -13,7 +13,7 @@ - QMAKE_LINK_C = $$QMAKE_CC - QMAKE_LINK_C_SHLIB = $$QMAKE_CC - --QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g -+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O3 -g - - QMAKE_CXX = g++ - diff --git a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch b/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch deleted file mode 100644 index 46b9c28..0000000 --- a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 87fa0250081cffb6e413fec7957f5ac4add6cdd1 Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> -Date: Tue, 8 Jan 2013 16:34:26 +0100 -Subject: [PATCH] set pkg-config *_location directly to install dir - -qmake tries to replace all occurrences of the install prefix with a -literal ${prefix}. of course this would mess up build paths which happen -to live under the prefix (this is untypical, but still), which would -break the sed magic in the subsequent install step. as qmake itself has -no use for the .pc files, it's ok to target them directly for the -install dir. we do the same with the include and lib dirs already. - -qt5 is already doing the right thing. - -Task-number: QTBUG-28807 -Change-Id: I82c17284d1dbac4a96845db2ddec9680e251e7a5 -Reviewed-by: Davide Pesavento <davidepesa@gmail.com> -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> - -diff --git a/src/qbase.pri b/src/qbase.pri -index 991c888..feec9d6 100644 ---- a/src/qbase.pri -+++ b/src/qbase.pri -@@ -166,23 +166,25 @@ DEFINES *= QT_USE_QSTRINGBUILDER - - TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end - --qtPrepareTool(QMAKE_LUPDATE, lupdate) --qtPrepareTool(QMAKE_LRELEASE, lrelease) -- -+QMAKE_MOC_PC = $$[QT_INSTALL_BINS]/moc - moc_dir.name = moc_location --moc_dir.variable = QMAKE_MOC -+moc_dir.variable = QMAKE_MOC_PC - -+QMAKE_UIC_PC = $$[QT_INSTALL_BINS]/uic - uic_dir.name = uic_location --uic_dir.variable = QMAKE_UIC -+uic_dir.variable = QMAKE_UIC_PC - -+QMAKE_RCC_PC = $$[QT_INSTALL_BINS]/rcc - rcc_dir.name = rcc_location --rcc_dir.variable = QMAKE_RCC -+rcc_dir.variable = QMAKE_RCC_PC - -+QMAKE_LUPDATE_PC = $$[QT_INSTALL_BINS]/lupdate - lupdate_dir.name = lupdate_location --lupdate_dir.variable = QMAKE_LUPDATE -+lupdate_dir.variable = QMAKE_LUPDATE_PC - -+QMAKE_LRELEASE_PC = $$[QT_INSTALL_BINS]/lrelease - lrelease_dir.name = lrelease_location --lrelease_dir.variable = QMAKE_LRELEASE -+lrelease_dir.variable = QMAKE_LRELEASE_PC - - QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir - --- -1.8.1.1 - |