[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.7.1-2-7-g3753ed5
Simon Quigley
tsimonq2-guest at moszumanska.debian.org
Tue Apr 18 02:40:48 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=926cf13
The following commit has been merged in the experimental branch:
commit 926cf138b3faff03cc23531ae9824e65e6a0cf3a
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Mon Apr 17 18:44:13 2017 -0500
Refresh fix_test_remove_qlibraryinfo.patch
---
debian/changelog | 1 +
debian/patches/fix_test_remove_qlibraryinfo.patch | 34 +++++++++++------------
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b0c1184..a00db07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtdeclarative-opensource-src (5.9.0~beta-1) UNRELEASED; urgency=medium
* Drop fix_tst_qqmlapplicationengine.diff as it's reverse-applicable.
* Refresh patches:
- disableopengltests.patch
+ - fix_test_remove_qlibraryinfo.patch
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 17 Apr 2017 06:43:41 -0500
diff --git a/debian/patches/fix_test_remove_qlibraryinfo.patch b/debian/patches/fix_test_remove_qlibraryinfo.patch
index 4fdef3f..56e99a6 100644
--- a/debian/patches/fix_test_remove_qlibraryinfo.patch
+++ b/debian/patches/fix_test_remove_qlibraryinfo.patch
@@ -6,7 +6,7 @@ Last-Update: 2016-09-16
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
-@@ -62,7 +62,7 @@
+@@ -64,7 +64,7 @@ tst_qmlmin::tst_qmlmin()
void tst_qmlmin::initTestCase()
{
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#endif
--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ void tst_QDebugMessageService::cleanupTe
void tst_QDebugMessageService::init()
{
m_connection = new QQmlDebugConnection();
@@ -28,7 +28,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
m_process->start(QStringList() << QLatin1String(NORMALMODE) << QQmlDataTest::instance()->testFile(QMLFILE));
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ bool tst_QQmlDebuggingEnabler::init(bool
connection = new QQmlDebugConnection();
if (qmlscene) {
@@ -37,10 +37,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
process->setMaximumBindErrors(1);
} else {
process = new QQmlDebugProcess(QCoreApplication::applicationDirPath() + QLatin1String("/qqmldebuggingenablerserver"), this);
-@@ -174,7 +174,7 @@
+@@ -185,7 +185,7 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+ QFETCH(bool, blockMode);
+ QFETCH(QStringList, services);
- connection = new QQmlDebugConnection();
- QList<QQmlDebugClient *> clients = QQmlDebugTest::createOtherClients(connection);
- process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene",
+ process = new QQmlDebugProcess(TESTBINDIR "/qmlscene",
this);
@@ -48,7 +48,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
process->start(QStringList()
--- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
+++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ void tst_QQmlDebugService::initTestCase(
void tst_QQmlDebugService::checkPortRange()
{
QQmlDebugConnection *connection1 = new QQmlDebugConnection();
@@ -57,7 +57,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
process1->start(QStringList() << QLatin1String("-qmljsdebugger=port:3782,3792") << testFile("test.qml"));
-@@ -120,7 +120,7 @@
+@@ -120,7 +120,7 @@ void tst_QQmlDebugService::checkPortRang
// Second instance
QQmlDebugConnection *connection2 = new QQmlDebugConnection();
@@ -68,7 +68,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ private slots:
void tst_QQmlEngineControl::connect(const QString &testFile, bool restrictServices)
{
@@ -79,7 +79,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
.arg(STR_PORT_FROM).arg(STR_PORT_TO)
--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
-@@ -73,8 +73,7 @@
+@@ -73,8 +73,7 @@ void tst_QQmlInspector::startQmlProcess(
.arg(STR_PORT_FROM).arg(STR_PORT_TO)
.arg(restrictServices ? QStringLiteral(",services:QmlInspector") : QString());
@@ -98,10 +98,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+QMAKE_CXXFLAGS += -DTESTBINDIR=\\"$$PWD/bin\\"
+QMAKE_CXXFLAGS += -DTESTEXAMPLEDIR=\\"$$PWD/examples\\"
+
- MODULE_VERSION = 5.7.1
+ MODULE_VERSION = 5.9.0
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ void tst_QQmlEngineDebugInspectorIntegra
.arg(restrictServices ? QStringLiteral(",services:QmlDebugger,QmlInspector") :
QString());
@@ -112,7 +112,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
QVERIFY2(m_process->waitForSessionStart(),
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
-@@ -297,7 +297,7 @@
+@@ -318,7 +318,7 @@ private slots:
void tst_QQmlProfilerService::connect(bool block, const QString &testFile, bool restrictServices)
{
// ### Still using qmlscene due to QTBUG-33377
@@ -123,7 +123,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
.arg(STR_PORT_FROM).arg(STR_PORT_TO)
--- a/tests/auto/qml/qmllint/main.cpp
+++ b/tests/auto/qml/qmllint/main.cpp
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ private:
void TestQmllint::initTestCase()
{
@@ -134,7 +134,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#endif
--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ tst_qmlplugindump::tst_qmlplugindump()
void tst_qmlplugindump::initTestCase()
{
@@ -145,7 +145,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
-@@ -169,8 +169,8 @@
+@@ -174,8 +174,8 @@ void tst_examples::namingConvention(cons
void tst_examples::namingConvention()
{
QStringList examplesLocations;
@@ -158,7 +158,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
QDir d(examples);
--- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
+++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
-@@ -780,8 +780,7 @@
+@@ -789,8 +789,7 @@ void tst_QQmlDebugJS::init(bool qmlscene
{
connection = new QQmlDebugConnection();
if (qmlscene)
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list