]> git.pld-linux.org Git - packages/qt4.git/commitdiff
- up to 4.7.2 auto/th/qt4-4_7_2-1
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Tue, 1 Mar 2011 20:01:15 +0000 (20:01 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    qt4-kde-git.patch -> 1.11
    qt4.spec -> 1.283

qt4-kde-git.patch
qt4.spec

index 3b63161a02d4063731872a029b5bb534aa94b753..e561c73cdacdd26b8ad39929d6977dea37e3dc11 100644 (file)
@@ -384,13 +384,15 @@ diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
 index 2e2a0f4..239de2d 100644
 --- a/src/corelib/kernel/qobject.cpp
 +++ b/src/corelib/kernel/qobject.cpp
-@@ -1095,8 +1095,16 @@ void QObject::setObjectName(const QString &name)
- {
-     Q_D(QObject);
-     d->objectName = name;
+@@ -1101,8 +1101,18 @@
+     if (objectNameChanged) 
+         d->declarativeData->objectNameChanged(d->declarativeData, this);
++
 +#if defined(Q_WS_X11)
 +    d->checkWindowRole();
 +#endif
++
  }
  
 +#if defined(Q_WS_X11)
index c3b01700002f199952758822735c00c3c6d02895..8fa0d7342ccf87b1870f327572273576cc2baaaa 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -66,12 +66,12 @@ Summary(es.UTF-8):  Biblioteca para ejecutar aplicaciones GUI Qt
 Summary(pl.UTF-8):     Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
-Version:       4.7.1
-Release:       6
+Version:       4.7.2
+Release:       1
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
-# Source0-md5: 6f88d96507c84e9fea5bf3a71ebeb6d7
+# Source0-md5: 66b992f5c21145df08c99d21847f4fdb
 Source2:       %{name}-qtconfig.desktop
 Source3:       %{name}-designer.desktop
 Source4:       %{name}-assistant.desktop
@@ -92,7 +92,6 @@ Patch6:               %{name}-build-lib-static.patch
 Patch7:                %{name}-x11_fonts.patch
 Patch8:                %{name}-pl-update.patch
 Patch9:                %{name}-ibase.patch
-Patch10:       qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch
 Patch11:       qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 URL:           http://www.qtsoftware.com/
 %{?with_ibase:BuildRequires:   Firebird-devel}
@@ -1407,7 +1406,6 @@ Programas exemplo para o Qt versão.
 %patch7 -p1
 #%patch8 -p1
 %patch9 -p1
-%patch10 -p1
 %patch11 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
This page took 0.127824 seconds and 4 git commands to generate.