]> SALOME platform Git repositories - tools/configuration.git/commitdiff
Salome HOME
Fix patch qt.001 to work with 'patch -p1' command gdd/fix_qt_patches
authorGilles DAVID <gilles-g.david@edf.fr>
Mon, 19 Jun 2017 06:52:39 +0000 (08:52 +0200)
committerGilles DAVID <gilles-g.david@edf.fr>
Mon, 19 Jun 2017 06:55:39 +0000 (08:55 +0200)
config/patches/qt.001_proxy_factory.patch
config/patches/qt.004_blender_scene.patch

index c31936ff32e32cefb21dd0943d28060e4539835f..b39fa98038b37e22a35cdb49c9353e83f6575f83 100644 (file)
@@ -1,6 +1,6 @@
 diff -NaurwB /tmp/qt/qt-5.6.1__0/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp /tmp/qt/qt-5.6.1__1/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp
---- /tmp/qt/qt-5.6.1__0/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp   2016-05-25 18:46:17.000000000 +0300
-+++ /tmp/qt/qt-5.6.1__1/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp   2017-03-15 17:51:11.051090499 +0300
+--- qt-5.6.1__0/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp   2016-05-25 18:46:17.000000000 +0300
++++ qt-5.6.1__1/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp   2017-03-15 17:51:11.051090499 +0300
 @@ -74,7 +74,7 @@
      QList<QUrl> ret;
  
index 11b5c6fc3e1716c33ae6f1b4a75d841ec85421c2..7dd045c46d345c96e6ed82db97ffd790317ef214 100644 (file)
@@ -1,6 +1,6 @@
 diff -NaurwB /tmp/qt/qt-5.6.1__0/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp /tmp/qt/qt-5.6.1__1/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp
---- /tmp/qt/qt-5.6.1__0/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp 2017-03-15 17:56:09.572756601 +0300
-+++ /tmp/qt/qt-5.6.1__1/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp 2017-03-15 18:00:35.950259586 +0300
+--- qt-5.6.1__0/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp 2017-03-15 17:56:09.572756601 +0300
++++ qt-5.6.1__1/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp 2017-03-15 18:00:35.950259586 +0300
 @@ -677,39 +677,39 @@
  //--------------------------------------------------------------------------------
  void DNA::RegisterConverters() {