Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 19239 → Rev 19240

/trunk/Scribus/ConfigureChecks.cmake
45,13 → 45,13
set(HAVE_BZIP2_SUPPORT 0)
endif(BZIP2_FOUND)
 
if(CAIRO_FOUND)
set(HAVE_LIBART 0)
set(HAVE_CAIRO 1)
else(CAIRO_FOUND)
set(HAVE_LIBART 1)
set(HAVE_CAIRO 0)
endif(CAIRO_FOUND)
#if(CAIRO_FOUND)
# set(HAVE_LIBART 0)
# set(HAVE_CAIRO 1)
#else(CAIRO_FOUND)
# set(HAVE_LIBART 1)
# set(HAVE_CAIRO 0)
#endif(CAIRO_FOUND)
 
if(CARBON_FOUND)
set(HAVE_CARBON 1)
/trunk/Scribus/scribus/CMakeLists.txt
1,5 → 1,6
 
IF (WANT_SVNVERSION)
ADD_DEFINITIONS(-DHAVE_SVNVERSION)
MESSAGE(STATUS "SVN Version requested in About dialog")
# a custom target that is always built
add_custom_target(svnheader ALL
/trunk/Scribus/scribus/ui/about.cpp
33,7 → 33,7
#include "scconfig.h"
#include "scpaths.h"
#include "sctextbrowser.h"
#ifdef WANT_SVNVERSION
#ifdef HAVE_SVNVERSION
#include "svnversion.h"
#endif
#include "util_ghostscript.h"
115,8 → 115,8
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
QString BUILD_DAY = "29";
QString BUILD_MONTH = CommonStrings::may;
QString BUILD_DAY = "15";
QString BUILD_MONTH = CommonStrings::june;
QString BUILD_YEAR = "2014";
QString BUILD_TIME = "";
QString BUILD_TZ = "";
133,7 → 133,7
if (BUILD_NAME == "BleedingEdge")
built = tr("%3-%2-%1 %4 %5").arg(BUILD_DAY).arg(BUILD_MONTH).arg(BUILD_YEAR).arg(BUILD_TIME).arg(BUILD_TZ);
 
#ifdef WANT_SVNVERSION
#ifdef HAVE_SVNVERSION
#ifdef SVNVERSION
QString revText;
revText=QString("SVN Revision: %1").arg(SVNVERSION);