Changeset 153

Timestamp:

Feb 21, 2014, 2:39:42 PM (11 years ago)

Author:

Silvan Scherrer

Message:

PSI: updated diff to latest psi 0.16 dev snapshot

File:

• diffs/psi_0.16.diff (modified) (5 diffs)

diffs/psi_0.16.diff

@@ -607 +607 @@
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/os2/Readme.OS2 trunk/os2/Readme.OS2
 --- vendor/current/os2/Readme.OS2       1970-01-01 01:00:00.000000000 +0100
-+++ trunk/os2/Readme.OS2        2013-12-06 15:50:44.000000000 +0100
-@@ -0,0 +1,225 @@
++++ trunk/os2/Readme.OS2        2014-02-18 12:25:44.000000000 +0100
+@@ -0,0 +1,228 @@
 +Psi 0.16-dev for OS/2 and eComStation
 +-------------------------------------
@@ -814 +814 @@
 +9. HISTORY
 +==========
++
++  2014-02-18
++    * updated to latest 0.16-dev sources
 +
 +  2013-12-06
@@ -900 +903 @@
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/src/config.h trunk/src/config.h
 --- vendor/current/src/config.h 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/src/config.h  2013-12-06 16:46:00.000000000 +0100
++++ trunk/src/config.h  2014-02-18 19:33:06.000000000 +0100
 @@ -0,0 +1,3 @@
 +#define PSI_LIBDIR "/usr/local/lib/psi"
 +#define PSI_DATADIR "/usr/local/share/psi"
-+#define PSI_VERSION "0.16-dev-20131206"
++#define PSI_VERSION "0.16-dev-20140218"
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/src/homedirmigration.cpp trunk/src/homedirmigration.cpp
 --- vendor/current/src/homedirmigration.cpp     2013-08-22 16:52:32.000000000 +0200
@@ -1189 +1192 @@
  #if defined(Q_OS_WIN)
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/src/textutil.cpp trunk/src/textutil.cpp
---- vendor/current/src/textutil.cpp     2013-12-03 18:34:22.000000000 +0100
-+++ trunk/src/textutil.cpp      2013-12-05 14:18:58.000000000 +0100
+--- vendor/current/src/textutil.cpp     2014-02-18 11:42:48.000000000 +0100
++++ trunk/src/textutil.cpp      2014-02-18 12:22:34.000000000 +0100
 @@ -87,7 +87,7 @@
         int col = 0;
@@ -1202 +1205 @@
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/src/webview.cpp trunk/src/webview.cpp
 --- vendor/current/src/webview.cpp      2013-12-03 18:34:22.000000000 +0100
-+++ trunk/src/webview.cpp       2013-12-06 17:20:26.000000000 +0100
-@@ -166,6 +166,22 @@
++++ trunk/src/webview.cpp       2014-02-19 16:26:34.000000000 +0100
+@@ -141,8 +141,11 @@
+ 
+        QDrag *drag = new QDrag(this);
+        QMimeData *mimeData = new QMimeData;
+-
++#ifdef __OS2__ // remove with qt 4.8 or better
++       QString html = selectedHtml();
++#else
+        QString html = TextUtil::img2title(selectedHtml());
++#endif
+        mimeData->setHtml(html);
+        mimeData->setText(TextUtil::rich2plain(html));
+ 
+@@ -153,7 +156,11 @@
+ void WebView::convertClipboardHtmlImages(QClipboard::Mode mode)
+ {
+        QClipboard *cb = QApplication::clipboard();
++#ifdef __OS2__ // remove with qt 4.8 or better
++       QString html = TextUtil::img2title(cb->mimeData(mode)->html());
++#else
+        QString html = TextUtil::img2title(selectedHtml());
++#endif
+        QMimeData *data = new QMimeData;
+        data->setHtml(html);
+        data->setText(TextUtil::rich2plain(html, false));
+@@ -166,6 +173,22 @@
         page()->mainFrame()->evaluateJavaScript(scriptSource);
  }