diff -ruN qtbase-opensource-src-5.4.1-orig/config.tests/unix/glib/glib.pro qtbase-opensource-src-5.4.1/config.tests/unix/glib/glib.pro --- qtbase-opensource-src-5.4.1-orig/config.tests/unix/glib/glib.pro 2015-02-16 22:56:55.000000000 -0600 +++ qtbase-opensource-src-5.4.1/config.tests/unix/glib/glib.pro 2015-03-25 21:21:14.000000000 -0500 @@ -1,2 +1,3 @@ SOURCES = glib.cpp CONFIG -= qt +LIBS += -lgthread-2.0 -lglib-2.0 diff -ruN -U8 qtbase-opensource-src-5.4.0-orig/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp qtbase-opensource-src-5.4.0/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp --- qtbase-opensource-src-5.4.0-orig/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp 2014-12-05 10:24:38.000000000 -0600 +++ qtbase-opensource-src-5.4.0/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp 2014-12-21 11:28:03.000000000 -0600 @@ -35,17 +35,17 @@ #error "iconv not supported on IRIX" #else #include int main(int, char **) { iconv_t x = iconv_open("", ""); - const char *inp; + char *inp; char *outp; size_t inbytes, outbytes; iconv(x, &inp, &inbytes, &outp, &outbytes); iconv_close(x); return 0; } diff -ruN -U8 qtbase-opensource-src-5.4.0-orig/mkspecs/common/gcc-base-mac.conf qtbase-opensource-src-5.4.0/mkspecs/common/gcc-base-mac.conf --- qtbase-opensource-src-5.4.0-orig/mkspecs/common/gcc-base-mac.conf 2014-12-05 10:24:38.000000000 -0600 +++ qtbase-opensource-src-5.4.0/mkspecs/common/gcc-base-mac.conf 2014-12-21 11:28:35.000000000 -0600 @@ -18,14 +18,14 @@ QMAKE_OBJECTIVE_CFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_OBJECTIVE_CFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS QMAKE_LFLAGS += -headerpad_max_install_names QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib -QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB +QMAKE_LFLAGS_PLUGIN += -bundle QMAKE_LFLAGS_INCREMENTAL += -undefined suppress -flat_namespace QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE} QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE} diff -ruN -U8 qtbase-opensource-src-5.4.0-orig/mkspecs/common/mac.conf qtbase-opensource-src-5.4.0/mkspecs/common/mac.conf --- qtbase-opensource-src-5.4.0-orig/mkspecs/common/mac.conf 2014-12-05 10:24:38.000000000 -0600 +++ qtbase-opensource-src-5.4.0/mkspecs/common/mac.conf 2014-12-21 11:34:28.000000000 -0600 @@ -3,16 +3,17 @@ # !load(device_config): error(Could not successfully load device configuration) QMAKE_PLATFORM += mac darwin QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_EXTENSION_SHLIB = dylib +QMAKE_EXTENSION_PLUGIN = so 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 diff -ruN -U8 qtbase-opensource-src-5.4.0-orig/mkspecs/features/create_cmake.prf qtbase-opensource-src-5.4.0/mkspecs/features/create_cmake.prf --- qtbase-opensource-src-5.4.0-orig/mkspecs/features/create_cmake.prf 2014-12-05 10:24:38.000000000 -0600 +++ qtbase-opensource-src-5.4.0/mkspecs/features/create_cmake.prf 2014-12-21 11:35:08.000000000 -0600 @@ -140,17 +140,17 @@ CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a } else { # MSVC static CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib } } else { mac { - isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so else: CMAKE_PlUGIN_EXT = .a CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} } else { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so else: CMAKE_PlUGIN_EXT = .a diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp index 3d0d5de..3d780cd 100644 --- a/src/tools/qlalr/lalr.cpp +++ b/src/tools/qlalr/lalr.cpp @@ -238,11 +238,11 @@ void Grammar::buildExtendedGrammar () non_terminals.insert (accept_symbol); } -struct _Nullable: public std::unary_function +struct Nullable: public std::unary_function { Automaton *_M_automaton; - _Nullable (Automaton *aut): + Nullable (Automaton *aut): _M_automaton (aut) {} bool operator () (Name name) const @@ -300,7 +300,7 @@ void Automaton::buildNullables () for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule) { - NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this))); + NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (Nullable (this))); if (nn == rule->rhs.end ()) changed |= nullables.insert (rule->lhs).second; @@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph () if (! _M_grammar->isNonTerminal (*A)) continue; - NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this))); + NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (Nullable (this))); if (first_not_nullable != rule->rhs.end ()) continue; diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm index 06e957c..922809f 100644 --- a/src/plugins/platforms/cocoa/qcocoacursor.mm +++ b/src/plugins/platforms/cocoa/qcocoacursor.mm @@ -73,7 +73,7 @@ void QCocoaCursor::setPos(const QPoint &position) pos.x = position.x(); pos.y = position.y(); - CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0); + CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft); CGEventPost(kCGHIDEventTap, e); CFRelease(e); }