782ebeada1
Conflicts: qmake/library/qmakebuiltins.cpp qmake/library/qmakeevaluator.cpp qmake/library/qmakeevaluator.h qmake/project.h QMakeEvaluator: * evaluateConditional(): one side changed return type, the other changed a parameter type. * split_value_list(): one side changed a parameter adjacent to where ... * expandVariableReferences(): ... the other killed one overload and changed the survivor src/corelib/io/qlockfile_unix.cpp One side changed a #if condition, the other moved NETBSD's part of what it controlled. src/corelib/tools/qdatetime.cpp One side fixed a reachable Q_UNREACHABLE in toMSecsSinceEpoch(), the other moved it from the private class to the public one, in the midst of the "short date-time" optimization, which confused diff entirely. One side changed a QStringLiteral to QLatin1String, the other rewrote adjoining code. src/network/kernel/qauthenticator.cpp Both rewrote a line, equivalently; kept the dev version. src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h One side changed #if-ery that the other removed. tools/configure/configureapp.cpp One side added a check to -target parsing; the other killed -target. tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml tests/auto/testlib/selftests/expected_cmptest.xunitxml Regenerated using generate_expected_output.py I note that quite a few other expected_* come out changed, now. There was no git-conflict in src/widgets/kernel/qformlayout.cpp but it didn't compile; one side removed some unused methods; the other found uses for one of them. Put FixedColumnMatrix<>::removeRow(int) back for its new user. Change-Id: I8cc2a71add48c0a848e13cfc47b5a7754e8ca584
43 lines
1.1 KiB
Plaintext
43 lines
1.1 KiB
Plaintext
#
|
|
# qmake configuration common to OS X and iOS
|
|
#
|
|
|
|
!load(device_config): error(Could not successfully load device configuration)
|
|
|
|
QMAKE_PLATFORM += mac darwin
|
|
|
|
MAKEFILE_GENERATOR = UNIX
|
|
CONFIG += app_bundle incremental global_init_link_order lib_version_first sdk
|
|
QMAKE_INCREMENTAL_STYLE = sublib
|
|
|
|
include(unix.conf)
|
|
|
|
QMAKE_RESOURCE = /Developer/Tools/Rez
|
|
QMAKE_EXTENSION_SHLIB = dylib
|
|
QMAKE_LIBDIR =
|
|
|
|
# sdk.prf will prefix the proper SDK sysroot
|
|
QMAKE_INCDIR_OPENGL = \
|
|
/System/Library/Frameworks/OpenGL.framework/Headers \
|
|
/System/Library/Frameworks/AGL.framework/Headers/
|
|
|
|
QMAKE_FIX_RPATH = install_name_tool -id
|
|
|
|
QMAKE_LFLAGS_RPATH = -Wl,-rpath,
|
|
QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
|
|
|
|
QMAKE_LFLAGS_REL_RPATH =
|
|
QMAKE_REL_RPATH_BASE = @loader_path
|
|
|
|
QMAKE_LIBS_DYNLOAD =
|
|
QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
|
|
QMAKE_LIBS_THREAD =
|
|
|
|
QMAKE_DSYMUTIL = dsymutil
|
|
QMAKE_STRIP = strip
|
|
QMAKE_STRIPFLAGS_LIB += -S -x
|
|
|
|
QMAKE_AR = ar cq
|
|
QMAKE_RANLIB = ranlib -s
|
|
QMAKE_NM = nm -P
|