Changeset 846 for trunk/src/gui/accessible
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 19 edited
-
. (modified) (1 prop)
-
src/gui/accessible/qaccessible.cpp (modified) (3 diffs)
-
src/gui/accessible/qaccessible.h (modified) (1 diff)
-
src/gui/accessible/qaccessible2.cpp (modified) (1 diff)
-
src/gui/accessible/qaccessible2.h (modified) (1 diff)
-
src/gui/accessible/qaccessible_mac.mm (modified) (1 diff)
-
src/gui/accessible/qaccessible_mac_carbon.cpp (modified) (1 diff)
-
src/gui/accessible/qaccessible_mac_cocoa.mm (modified) (2 diffs)
-
src/gui/accessible/qaccessible_mac_p.h (modified) (3 diffs)
-
src/gui/accessible/qaccessible_unix.cpp (modified) (1 diff)
-
src/gui/accessible/qaccessible_win.cpp (modified) (4 diffs)
-
src/gui/accessible/qaccessiblebridge.cpp (modified) (1 diff)
-
src/gui/accessible/qaccessiblebridge.h (modified) (1 diff)
-
src/gui/accessible/qaccessibleobject.cpp (modified) (1 diff)
-
src/gui/accessible/qaccessibleobject.h (modified) (1 diff)
-
src/gui/accessible/qaccessibleplugin.cpp (modified) (1 diff)
-
src/gui/accessible/qaccessibleplugin.h (modified) (1 diff)
-
src/gui/accessible/qaccessiblewidget.cpp (modified) (1 diff)
-
src/gui/accessible/qaccessiblewidget.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/accessible/qaccessible.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 390 390 */ 391 391 392 #if !defined(QT_NO_LIBRARY) && (!defined(QT_NO_SETTINGS) || !defined(Q_OS_WIN))392 #ifndef QT_NO_LIBRARY 393 393 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, 394 394 (QAccessibleFactoryInterface_iid, QLatin1String("/accessible"))) … … 533 533 return iface; 534 534 } 535 #if !defined(QT_NO_LIBRARY) && (!defined(QT_NO_SETTINGS) || !defined(Q_OS_WIN))535 #ifndef QT_NO_LIBRARY 536 536 QAccessibleFactoryInterface *factory = qobject_cast<QAccessibleFactoryInterface*>(loader()->instance(cn)); 537 537 if (factory) { -
trunk/src/gui/accessible/qaccessible.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessible2.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessible2.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessible_mac.mm
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessible_mac_carbon.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessible_mac_cocoa.mm
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 59 59 //#define MAC_ACCESSIBILTY_DEVELOPER_MODE 60 60 61 #ifndef QT_NO_DEBUG_STREAM 61 62 #ifdef MAC_ACCESSIBILTY_DEVELOPER_MODE 62 63 #define MAC_ACCESSIBILTY_DEBUG QT_PREPEND_NAMESPACE(qDebug) 63 64 #else 64 65 #define MAC_ACCESSIBILTY_DEBUG if (0) QT_PREPEND_NAMESPACE(qDebug) 66 #endif 67 #else 68 #define MAC_ACCESSIBILTY_DEBUG if (0) QT_PREPEND_NAMESPACE(QNoDebug) 65 69 #endif 66 70 -
trunk/src/gui/accessible/qaccessible_mac_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 123 123 124 124 It has the same API as QAccessibleInterface, minus the child parameter 125 in the func itons.125 in the functions. 126 126 */ 127 127 class Q_AUTOTEST_EXPORT QAInterface : public QAccessible … … 433 433 QAccessibleHierarchyManager bridges the Mac and Qt accessibility hierarchies. 434 434 There is a one-to-one relationship between QAElements on the Mac side 435 and QAInterfaces on the Qt side, and this class provi es lookup funcitons435 and QAInterfaces on the Qt side, and this class provides lookup functions 436 436 that translates between these to items. 437 437 -
trunk/src/gui/accessible/qaccessible_unix.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessible_win.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 43 43 44 44 #include "qapplication.h" 45 #include "qlibrary.h"45 #include <private/qsystemlibrary_p.h> 46 46 #include "qmessagebox.h" // ### dependency 47 47 #include "qt_windows.h" … … 77 77 { 78 78 static const char *roles[] = { 79 "NoRole" /* = 0x00000000*/,80 "TitleBar" /* = 0x00000001*/,81 "MenuBar" /* = 0x00000002*/,82 "ScrollBar" /* = 0x00000003*/,83 "Grip" /* = 0x00000004*/,84 "Sound" /* = 0x00000005*/,85 "Cursor" /* = 0x00000006*/,86 "Caret" /* = 0x00000007*/,87 "AlertMessage" /* = 0x00000008*/,88 "Window" /* = 0x00000009*/,89 "Client" /* = 0x0000000A*/,90 "PopupMenu" /* = 0x0000000B*/,91 "MenuItem" /* = 0x0000000C*/,92 "ToolTip" /* = 0x0000000D*/,93 "Application" /* = 0x0000000E*/,94 "Document" /* = 0x0000000F*/,95 "Pane" /* = 0x00000010*/,96 "Chart" /* = 0x00000011*/,97 "Dialog" /* = 0x00000012*/,98 "Border" /* = 0x00000013*/,99 "Grouping" /* = 0x00000014*/,100 "Separator" /* = 0x00000015*/,101 "ToolBar" /* = 0x00000016*/,102 "StatusBar" /* = 0x00000017*/,103 "Table" /* = 0x00000018*/,104 "ColumnHeader" /* = 0x00000019*/,105 "RowHeader" /* = 0x0000001A*/,106 "Column" /* = 0x0000001B*/,107 "Row" /* = 0x0000001C*/,108 "Cell" /* = 0x0000001D*/,109 "Link" /* = 0x0000001E*/,110 "HelpBalloon" /* = 0x0000001F*/,111 "Assistant" /* = 0x00000020*/,112 "List" /* = 0x00000021*/,113 "ListItem" /* = 0x00000022*/,114 "Tree" /* = 0x00000023*/,115 "TreeItem" /* = 0x00000024*/,116 "PageTab" /* = 0x00000025*/,117 "PropertyPage" /* = 0x00000026*/,118 "Indicator" /* = 0x00000027*/,119 "Graphic" /* = 0x00000028*/,120 "StaticText" /* = 0x00000029*/,121 "EditableText" /* = 0x0000002A*/, // Editable, selectable, etc.122 "PushButton" /* = 0x0000002B*/,123 "CheckBox" /* = 0x0000002C*/,124 "RadioButton" /* = 0x0000002D*/,125 "ComboBox" /* = 0x0000002E*/,126 "DropList" /* = 0x0000002F*/, // commented out127 "ProgressBar" /* = 0x00000030*/,128 "Dial" /* = 0x00000031*/,129 "HotkeyField" /* = 0x00000032*/,130 "Slider" /* = 0x00000033*/,131 "SpinBox" /* = 0x00000034*/,132 "Canvas" /* = 0x00000035*/,133 "Animation" /* = 0x00000036*/,134 "Equation" /* = 0x00000037*/,135 "ButtonDropDown" /* = 0x00000038*/,136 "ButtonMenu" /* = 0x00000039*/,137 "ButtonDropGrid" /* = 0x0000003A*/,138 "Whitespace" /* = 0x0000003B*/,139 "PageTabList" /* = 0x0000003C*/,140 "Clock" /* = 0x0000003D*/,141 "Splitter" /* = 0x0000003E*/,142 "LayeredPane" /* = 0x0000003F*/,143 "UserRole" /* = 0x0000ffff*/79 "NoRole" /* = 0x00000000 */, 80 "TitleBar" /* = 0x00000001 */, 81 "MenuBar" /* = 0x00000002 */, 82 "ScrollBar" /* = 0x00000003 */, 83 "Grip" /* = 0x00000004 */, 84 "Sound" /* = 0x00000005 */, 85 "Cursor" /* = 0x00000006 */, 86 "Caret" /* = 0x00000007 */, 87 "AlertMessage" /* = 0x00000008 */, 88 "Window" /* = 0x00000009 */, 89 "Client" /* = 0x0000000A */, 90 "PopupMenu" /* = 0x0000000B */, 91 "MenuItem" /* = 0x0000000C */, 92 "ToolTip" /* = 0x0000000D */, 93 "Application" /* = 0x0000000E */, 94 "Document" /* = 0x0000000F */, 95 "Pane" /* = 0x00000010 */, 96 "Chart" /* = 0x00000011 */, 97 "Dialog" /* = 0x00000012 */, 98 "Border" /* = 0x00000013 */, 99 "Grouping" /* = 0x00000014 */, 100 "Separator" /* = 0x00000015 */, 101 "ToolBar" /* = 0x00000016 */, 102 "StatusBar" /* = 0x00000017 */, 103 "Table" /* = 0x00000018 */, 104 "ColumnHeader" /* = 0x00000019 */, 105 "RowHeader" /* = 0x0000001A */, 106 "Column" /* = 0x0000001B */, 107 "Row" /* = 0x0000001C */, 108 "Cell" /* = 0x0000001D */, 109 "Link" /* = 0x0000001E */, 110 "HelpBalloon" /* = 0x0000001F */, 111 "Assistant" /* = 0x00000020 */, 112 "List" /* = 0x00000021 */, 113 "ListItem" /* = 0x00000022 */, 114 "Tree" /* = 0x00000023 */, 115 "TreeItem" /* = 0x00000024 */, 116 "PageTab" /* = 0x00000025 */, 117 "PropertyPage" /* = 0x00000026 */, 118 "Indicator" /* = 0x00000027 */, 119 "Graphic" /* = 0x00000028 */, 120 "StaticText" /* = 0x00000029 */, 121 "EditableText" /* = 0x0000002A */, // Editable, selectable, etc. 122 "PushButton" /* = 0x0000002B */, 123 "CheckBox" /* = 0x0000002C */, 124 "RadioButton" /* = 0x0000002D */, 125 "ComboBox" /* = 0x0000002E */, 126 "DropList" /* = 0x0000002F */, // commented out 127 "ProgressBar" /* = 0x00000030 */, 128 "Dial" /* = 0x00000031 */, 129 "HotkeyField" /* = 0x00000032 */, 130 "Slider" /* = 0x00000033 */, 131 "SpinBox" /* = 0x00000034 */, 132 "Canvas" /* = 0x00000035 */, 133 "Animation" /* = 0x00000036 */, 134 "Equation" /* = 0x00000037 */, 135 "ButtonDropDown" /* = 0x00000038 */, 136 "ButtonMenu" /* = 0x00000039 */, 137 "ButtonDropGrid" /* = 0x0000003A */, 138 "Whitespace" /* = 0x0000003B */, 139 "PageTabList" /* = 0x0000003C */, 140 "Clock" /* = 0x0000003D */, 141 "Splitter" /* = 0x0000003E */, 142 "LayeredPane" /* = 0x0000003F */, 143 "UserRole" /* = 0x0000ffff*/ 144 144 }; 145 145 … … 244 244 if (!resolvedNWE) { 245 245 resolvedNWE = true; 246 ptrNotifyWinEvent = (PtrNotifyWinEvent)Q Library::resolve(QLatin1String("user32"), "NotifyWinEvent");246 ptrNotifyWinEvent = (PtrNotifyWinEvent)QSystemLibrary::resolve(QLatin1String("user32"), "NotifyWinEvent"); 247 247 } 248 248 if (!ptrNotifyWinEvent) -
trunk/src/gui/accessible/qaccessiblebridge.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessiblebridge.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessibleobject.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessibleobject.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessibleplugin.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessibleplugin.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessiblewidget.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/gui/accessible/qaccessiblewidget.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com)
Note:
See TracChangeset
for help on using the changeset viewer.
