# HG changeset patch # User koda # Date 1326667841 -3600 # Node ID b92d7c14403850cbc7e8ea4dc32c33b68c1f66c1 # Parent ec059b55aa72b029ff7dca00c14dd7c91b896a53 hedgewars.pro formatting and removal of the last pageoptions hr diff -r ec059b55aa72 -r b92d7c144038 QTfrontend/ui/page/pageoptions.cpp --- a/QTfrontend/ui/page/pageoptions.cpp Sun Jan 15 23:35:02 2012 +0100 +++ b/QTfrontend/ui/page/pageoptions.cpp Sun Jan 15 23:50:41 2012 +0100 @@ -385,12 +385,6 @@ CBShowFPS->setText(QCheckBox::tr("Show FPS")); GBAlayout->addWidget(CBShowFPS); - hr = new QFrame(AGGroupBox); - hr->setFrameStyle(QFrame::HLine); - hr->setLineWidth(3); - hr->setFixedHeight(10); - GBAlayout->addWidget(hr); - gbTBLayout->addWidget(AGGroupBox, 0, 1, 3, 1); } diff -r ec059b55aa72 -r b92d7c144038 project_files/hedgewars.pro --- a/project_files/hedgewars.pro Sun Jan 15 23:35:02 2012 +0100 +++ b/project_files/hedgewars.pro Sun Jan 15 23:50:41 2012 +0100 @@ -16,7 +16,7 @@ DESTDIR = . win32 { - RC_FILE = ../QTfrontend/hedgewars.rc + RC_FILE = ../QTfrontend/hedgewars.rc } QT += network @@ -93,7 +93,7 @@ ../QTfrontend/achievements.h \ ../QTfrontend/binds.h \ ../QTfrontend/ui_hwform.h \ - ../QTfrontend/KB.h \ + ../QTfrontend/KB.h \ ../QTfrontend/hwconsts.h \ ../QTfrontend/sdlkeys.h \ ../QTfrontend/ui/mouseoverfilter.h \ @@ -180,7 +180,7 @@ ../QTfrontend/ui/page/pagefeedback.cpp win32 { - SOURCES += ../QTfrontend/xfire.cpp + SOURCES += ../QTfrontend/xfire.cpp } TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ar.ts @@ -213,22 +213,21 @@ LIBS += -L../misc/quazip -lquazip !macx { - LIBS += -lSDL -lSDL_mixer + LIBS += -lSDL -lSDL_mixer } else { - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.6.sdk - - OBJECTIVE_SOURCES += ../QTfrontend/*.m ../QTfrontend/*.mm - SOURCES += ../QTfrontend/AutoUpdater.cpp ../QTfrontend/InstallController.cpp \ - ../../build/QTfrontend/hwconsts.cpp - HEADERS += ../QTfrontend/M3InstallController.h ../QTfrontend/M3Panel.h \ - ../QTfrontend/NSWorkspace_RBAdditions.h ../QTfrontend/AutoUpdater.h \ - ../QTfrontend/CocoaInitializer.h ../QTfrontend/InstallController.h \ - ../QTfrontend/SparkleAutoUpdater.h - - LIBS += -lobjc -framework AppKit -framework IOKit -framework Foundation -framework SDL -framework SDL_Mixer -framework Sparkle -DSPARKLE_ENABLED - INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers /Library/Frameworks/SDL_Mixer.framework/Headers - CONFIG += warn_on x86 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.6.sdk - #CONFIG += x86 ppc x86_64 ppc64 + OBJECTIVE_SOURCES += ../QTfrontend/*.m ../QTfrontend/*.mm + SOURCES += ../QTfrontend/AutoUpdater.cpp ../QTfrontend/InstallController.cpp \ + ../../build/QTfrontend/hwconsts.cpp + HEADERS += ../QTfrontend/M3InstallController.h ../QTfrontend/M3Panel.h \ + ../QTfrontend/NSWorkspace_RBAdditions.h ../QTfrontend/AutoUpdater.h \ + ../QTfrontend/CocoaInitializer.h ../QTfrontend/InstallController.h \ + ../QTfrontend/SparkleAutoUpdater.h + + LIBS += -lobjc -framework AppKit -framework IOKit -framework Foundation -framework SDL -framework SDL_Mixer -framework Sparkle -DSPARKLE_ENABLED + INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers /Library/Frameworks/SDL_Mixer.framework/Headers + CONFIG += warn_on x86 + #CONFIG += x86 ppc x86_64 ppc64 }