diff options
author | François Andriot <albator78@libertysurf.fr> | 2014-10-01 20:01:06 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2014-10-01 20:01:06 +0200 |
commit | cd987458557f4163072c33effd4df34e7e8a4288 (patch) | |
tree | 90cf7aecf9dfd20f03572e6d81f38c3a9cc36120 /redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch | |
parent | fc5d3c8d01e679b569e18b13488363cadb5e1d7f (diff) | |
parent | 4ed48b596a3124deac51b66df656c57f9f88c4d9 (diff) | |
download | tde-packaging-cd987458557f4163072c33effd4df34e7e8a4288.tar.gz tde-packaging-cd987458557f4163072c33effd4df34e7e8a4288.zip |
merge
Diffstat (limited to 'redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch')
-rw-r--r-- | redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch deleted file mode 100644 index beb82b4d4..000000000 --- a/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h.ORI 2014-05-04 12:49:48.579786273 -0400 -+++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h 2014-05-04 12:50:00.948216121 -0400 -@@ -287,6 +287,7 @@ - TQ_UINT32 topLevelWidgetFlags; - TQPixmap paletteBgPixmap; - -+/* - #ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY - public: - TQStyleControlElementData(const TQStyleControlElementData&); -@@ -295,6 +296,7 @@ - // Disable copy constructor - TQStyleControlElementData(const TQStyleControlElementData&); - #endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY -+*/ - - }; - ---- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp.ORI 2014-05-04 12:50:38.499448860 -0400 -+++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp 2014-05-04 12:50:49.766018474 -0400 -@@ -2836,6 +2836,7 @@ - // - } - -+/* - TQStyleControlElementData::TQStyleControlElementData(const TQStyleControlElementData& orig) { - isNull = orig.isNull; - widgetObjectTypes = orig.widgetObjectTypes; -@@ -2898,5 +2899,6 @@ - topLevelWidgetFlags = orig.topLevelWidgetFlags; - paletteBgPixmap = orig.paletteBgPixmap; - } -+*/ - - #endif // QT_NO_STYLE |