r22023 by craig - #14711: Don't install unnecessary files
scribus-commit
scribus-commit at lists.scribus.net
Sun May 14 20:28:26 UTC 2017
Author: craig
Date: Sun May 14 20:28:26 2017
New Revision: 22023
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22023
Log:
#14711: Don't install unnecessary files
Modified:
trunk/Scribus/CMakeLists.txt
trunk/Scribus/Scribus.pro
trunk/Scribus/scribus/ui/storyeditor.cpp
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22023&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sun May 14 20:28:26 2017
@@ -1013,14 +1013,10 @@
#Install our READMEs etc.
install(FILES
AUTHORS
- BUILDING
ChangeLog
COPYING
LINKS
- NEWS
- PACKAGING
README
- TODO
TRANSLATION
DESTINATION ${DOCDIR}
)
Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22023&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro (original)
+++ trunk/Scribus/Scribus.pro Sun May 14 20:28:26 2017
@@ -1,5 +1,5 @@
######################################################################
-# Automatically generated by qmake (3.1) Mon Apr 17 18:22:30 2017
+# Automatically generated by qmake (3.1) Sat May 6 17:10:58 2017
######################################################################
INCLUDEPATH+=./scribus
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22023&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sun May 14 20:28:26 2017
@@ -2128,8 +2128,7 @@
Editor->clear();
setWindowTitle( tr( "Story Editor" ));
}
- QString data = QApplication::clipboard()->text(QClipboard::Clipboard);
- if (!data.isNull())
+ if (!QApplication::clipboard()->text(QClipboard::Clipboard).isNull())
seActions["editPaste"]->setEnabled(true);
}
More information about the scribus-commit
mailing list