From af0df2d04705368459369c311ffae68f01206f9b Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 2 May 2012 13:47:05 +0200 Subject: Remove unused Mac OS X code from QtWidgets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qcolordialog_mac.mm, qfiledialog_mac.mm, qfontdialog_mac.mm, and qnspanelproxy_mac.mm are unused, remove them. The functionality they used to provide is already included in the Cocoa platform plugin. Change-Id: I2815d119687fd8d8dd421da36563afbd645ee000 Reviewed-by: Morten Johan Sørvig --- src/widgets/dialogs/dialogs.pri | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/widgets/dialogs/dialogs.pri') diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri index f8ca43c5e4..53d1985fb5 100644 --- a/src/widgets/dialogs/dialogs.pri +++ b/src/widgets/dialogs/dialogs.pri @@ -20,27 +20,6 @@ HEADERS += \ dialogs/qfileinfogatherer_p.h \ dialogs/qwizard.h -# TODO -false:mac { - OBJECTIVE_SOURCES += dialogs/qfiledialog_mac.mm \ - dialogs/qfontdialog_mac.mm \ - dialogs/qnspanelproxy_mac.mm - -# Compile qcolordialog_mac.mm with exception support, disregarding the -no-exceptions -# configure option. (qcolordialog_mac needs to catch exceptions thrown by cocoa) - EXCEPTION_SOURCES = dialogs/qcolordialog_mac.mm - exceptions_compiler.commands = $$QMAKE_CXX -c - exceptions_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - exceptions_compiler.commands += -fexceptions - exceptions_compiler.dependency_type = TYPE_C - exceptions_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} - exceptions_compiler.input = EXCEPTION_SOURCES - exceptions_compiler.variable_out = OBJECTS - exceptions_compiler.name = compiling[exceptopns] ${QMAKE_FILE_IN} - silent:exceptions_compiler.commands = @echo compiling[exceptopns] ${QMAKE_FILE_IN} && $$exceptions_compiler.commands - QMAKE_EXTRA_COMPILERS += exceptions_compiler -} - win32 { HEADERS += dialogs/qwizard_win_p.h SOURCES += dialogs/qwizard_win.cpp -- cgit v1.2.3