[Kst] branches/work/kst/2.0.0-beta1-test/kst

[Mike Fenton]

SVN commit 891271 by fenton:

Update notes for release.
Update define in applicationsettings.cpp to support Mac OS.


 M  +2 -0      AUTHORS  
 M  +8 -0      INSTALL  
 M  +1 -5      README  
 M  +3 -3      config.pri  
 M  +3 -3      src/libkstapp/applicationsettings.cpp  


--- branches/work/kst/2.0.0-beta1-test/kst/AUTHORS #891270:891271
@@ -3,4 +3,6 @@
 George Staikos <staikos at kde.org>
 Andrew Walker <arwalker at sumusltd.com>
 Rick Chern <rchern at interchange.ubc.ca>
+Eli Filder <eli at staikos.net>
+Mike Fenton <mike at staikos.net>
 
--- branches/work/kst/2.0.0-beta1-test/kst/INSTALL #891270:891271
@@ -8,6 +8,14 @@
 4. ./build-kst
 5. ./run-kst
 
+Mac OS
+
+Notes:
+
+#1.  Same as the steps for Linux with some modifications required.
+#2.  The qmake command line needs to be updated to include -spec macx-g++.
+#3.  An error has been observed compiling view.cpp, view.h may need to be updated to change QXmlStreamWriter to QCoreXmlStreamWriter on line 45.
+
 Windows
 
 Note:  This has only been build using Visual Studio & Cygwin.  The following steps
--- branches/work/kst/2.0.0-beta1-test/kst/README #891270:891271
@@ -1,10 +1,6 @@
-
 This application is used to display scientific data.  More to come later.
 
-When installing, please be sure to use --prefix to point to the KDE install
-directory to ensure that the XML and desktop files are picked up.  Symptoms
-of an incorrect installation include missing menu entries and inability to
-load and display data.
+Please see INSTALL for installation details.
 
 Please direct questions or concerns to kst at kde.org.
 
--- branches/work/kst/2.0.0-beta1-test/kst/config.pri #891270:891271
@@ -1,8 +1,8 @@
 # Define if you have cfitsio
-HAVE_CFITSIO = 1
+HAVE_CFITSIO = 0
 
 #Define if you have dirfile getdata library version 0.4.2 or greater required.
-HAVE_DIRFILE = 1
+HAVE_DIRFILE = 0
 
 #Define if you have the gsl library installed
-HAVE_GSL = 1
\ No newline at end of file
+HAVE_GSL = 0
\ No newline at end of file
--- branches/work/kst/2.0.0-beta1-test/kst/src/libkstapp/applicationsettings.cpp #891270:891271
@@ -18,7 +18,7 @@
 #include <QSettings>
 
 #include <QDebug>
-#ifndef Q_WS_WIN32
+#ifdef Q_WS_X11
 #include <QX11Info>
 #endif
 
@@ -100,7 +100,7 @@
 
 int ApplicationSettings::referenceViewWidth() const {
   double dpiScale = 72.0;
-#ifndef Q_WS_WIN32
+#ifdef Q_WS_X11
     dpiScale = QX11Info::appDpiX();
 #endif
   return (_refViewWidth * dpiScale * 0.3937008);
@@ -121,7 +121,7 @@
 
 int ApplicationSettings::referenceViewHeight() const {
   double dpiScale = 72.0;
-#ifndef Q_WS_WIN32
+#ifdef Q_WS_X11
     dpiScale = QX11Info::appDpiY();
 #endif
   return (_refViewHeight * dpiScale * 0.3937008);