Merge branch 'master' into f17
This commit is contained in:
commit
e9c74799c4
29
texstudio-2.3-testcase.patch
Normal file
29
texstudio-2.3-testcase.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From cb478565396b325a0860747a3c9c90789b13aea1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: hannes <hannes@fedoraproject.org>
|
||||||
|
Date: Thu, 16 Feb 2012 20:49:50 +0000
|
||||||
|
Subject: [PATCH] Fix the testcase build failure
|
||||||
|
|
||||||
|
---
|
||||||
|
tests/qsearchreplacepanel_t.cpp | 6 +++---
|
||||||
|
1 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/qsearchreplacepanel_t.cpp b/tests/qsearchreplacepanel_t.cpp
|
||||||
|
index e043f8b..22d6013 100644
|
||||||
|
--- tests/qsearchreplacepanel_t.cpp
|
||||||
|
+++ tests/qsearchreplacepanel_t.cpp
|
||||||
|
@@ -213,9 +213,9 @@ void QSearchReplacePanelTest::incrementalsearch(){
|
||||||
|
widget->cFind->lineEdit()->cursorForward(false,search.length());
|
||||||
|
QTest::keyClick(widget->cFind->lineEdit(),search[search.length()-1].toLatin1());
|
||||||
|
}
|
||||||
|
- QDocumentCursor s=ed->cursor().selectionStart();
|
||||||
|
- QEQUAL2(s.lineNumber(), cy, search+" "+ed->cursor().selectedText()+" "+QString::number(loop));
|
||||||
|
- QEQUAL2(s.columnNumber(), cx, search+" "+ed->cursor().selectedText());
|
||||||
|
+ QDocumentCursor c=ed->cursor().selectionStart();
|
||||||
|
+ QEQUAL2(c.lineNumber(), cy, search+" "+ed->cursor().selectedText()+" "+QString::number(loop));
|
||||||
|
+ QEQUAL2(c.columnNumber(), cx, search+" "+ed->cursor().selectedText());
|
||||||
|
QEQUAL2(ed->cursor().selectedText(), res, search+" "+ed->cursor().selectedText());
|
||||||
|
//searching shouldn't change highlighted selection
|
||||||
|
QCEMULTIEQUAL(getHighlightedSelection(ed), panel->getSearchScope(), ed->document()->cursor(scopey1,scopex1,scopey2,scopex2));
|
||||||
|
--
|
||||||
|
1.7.7.6
|
||||||
|
|
@ -15,6 +15,7 @@ Patch0: texstudio-use-system-hunspell-instead-of-bundled-one.patch
|
|||||||
Patch1: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
Patch1: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
|
||||||
Patch2: texstudio-viewers-use-xdg-open.patch
|
Patch2: texstudio-viewers-use-xdg-open.patch
|
||||||
Patch3: texstudio-2.3-gcc-4.7-build-failure.patch
|
Patch3: texstudio-2.3-gcc-4.7-build-failure.patch
|
||||||
|
Patch4: texstudio-2.3-testcase.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: qt4-devel
|
BuildRequires: qt4-devel
|
||||||
@ -47,6 +48,7 @@ so it keeps it look&feel.
|
|||||||
%patch1 -p0 -b .qtsingle
|
%patch1 -p0 -b .qtsingle
|
||||||
%patch2 -p0 -b .xdg
|
%patch2 -p0 -b .xdg
|
||||||
%patch3 -p0 -b .gcc4.7
|
%patch3 -p0 -b .gcc4.7
|
||||||
|
%patch4 -p0 -b .testcase
|
||||||
|
|
||||||
rm -rf {hunspell,qtsingleapplication}
|
rm -rf {hunspell,qtsingleapplication}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user