Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24775 → Rev 24776

/trunk/Scribus/CMakeLists_Apple.cmake
123,11 → 123,20
endif()
# gcc/mac
if(WANT_UNIVERSAL_BUNDLE)
message(STATUS "Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
set(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
if (WANT_OSX_SDK)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
if (WANT_PPC_I386_BUNDLE)
message(STATUS "Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
set(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
if (WANT_OSX_SDK)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
endif()
else()
message(STATUS "Setting Universal (ARM/x64_64) Architecture for OSX Build/Bundle")
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" )
set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "arm64;x86_64" )
if (WANT_OSX_SDK)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
endif()
endif()
else()
if(ARCH_PPC OR ARCH_PPC_64)
/trunk/Scribus/scribus/ui/about.cpp
99,7 → 99,6
aboutLayout->setSpacing(6);
aboutLayout->setContentsMargins(9, 9, 9, 9);
tabWidget2 = new QTabWidget( this );
// tabWidget2->setMinimumSize( QSize( 438, 258 ) );
tab = new QWidget( tabWidget2 );
tabLayout1 = new QVBoxLayout( tab );
tabLayout1->setSpacing(6);
127,8 → 126,8
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
QString BUILD_DAY = "24";
QString BUILD_MONTH = CommonStrings::august;
QString BUILD_DAY = "5";
QString BUILD_MONTH = CommonStrings::december;
QString BUILD_YEAR = "2021";
QString BUILD_TIME = "";
QString BUILD_TZ = "";