Changeset 57327 in webkit
- Timestamp:
- Apr 9, 2010 3:55:22 AM (14 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qgraphicswebview.cpp
r56837 r57327 1062 1062 QAction *QGraphicsWebView::pageAction(QWebPage::WebAction action) const 1063 1063 { 1064 #ifdef QT_NO_ACTION 1065 Q_UNUSED(action) 1066 return 0; 1067 #else 1064 1068 return page()->action(action); 1069 #endif 1065 1070 } 1066 1071 -
trunk/WebKit/qt/Api/qwebpage.cpp
r57323 r57327 620 620 #endif // QT_NO_CONTEXTMENU 621 621 622 #ifndef QT_NO_ACTION 622 623 void QWebPagePrivate::_q_webActionTriggered(bool checked) 623 624 { … … 628 629 q->triggerAction(action, checked); 629 630 } 631 #endif // QT_NO_ACTION 630 632 631 633 void QWebPagePrivate::_q_cleanupLeakMessages() … … 639 641 void QWebPagePrivate::updateAction(QWebPage::WebAction action) 640 642 { 643 #ifdef QT_NO_ACTION 644 Q_UNUSED(action) 645 #else 641 646 QAction *a = actions[action]; 642 647 if (!a || !mainFrame) … … 698 703 if (a->isCheckable()) 699 704 a->setChecked(checked); 705 #endif // QT_NO_ACTION 700 706 } 701 707 … … 2311 2317 } 2312 2318 2319 #ifndef QT_NO_ACTION 2313 2320 /*! 2314 2321 Returns a QAction for the specified WebAction \a action. … … 2583 2590 return a; 2584 2591 } 2592 #endif // QT_NO_ACTION 2585 2593 2586 2594 /*! … … 2852 2860 void QWebPage::updatePositionDependentActions(const QPoint &pos) 2853 2861 { 2862 #ifndef QT_NO_ACTION 2854 2863 // First we disable all actions, but keep track of which ones were originally enabled. 2855 2864 QBitArray originallyEnabledWebActions(QWebPage::WebActionCount); … … 2861 2870 } 2862 2871 } 2872 #endif // QT_NO_ACTION 2863 2873 2864 2874 d->createMainFrame(); … … 2887 2897 #endif // QT_NO_CONTEXTMENU 2888 2898 2899 #ifndef QT_NO_ACTION 2889 2900 // Finally, we restore the original enablement for the actions that were not put into the menu. 2890 2901 originallyEnabledWebActions &= ~visitedWebActions; // Mask out visited actions (they're part of the menu) … … 2895 2906 } 2896 2907 } 2908 #endif // QT_NO_ACTION 2897 2909 2898 2910 // This whole process ensures that any actions put into to the context menu has the right -
trunk/WebKit/qt/Api/qwebpage.h
r56450 r57327 221 221 QString selectedText() const; 222 222 223 #ifndef QT_NO_ACTION 223 224 QAction *action(WebAction action) const; 225 #endif 224 226 virtual void triggerAction(WebAction action, bool checked = false); 225 227 … … 349 351 private: 350 352 Q_PRIVATE_SLOT(d, void _q_onLoadProgressChanged(int)) 353 #ifndef QT_NO_ACTION 351 354 Q_PRIVATE_SLOT(d, void _q_webActionTriggered(bool checked)) 355 #endif 352 356 Q_PRIVATE_SLOT(d, void _q_cleanupLeakMessages()) 353 357 -
trunk/WebKit/qt/Api/qwebview.cpp
r56450 r57327 586 586 } 587 587 588 #ifndef QT_NO_ACTION 588 589 /*! 589 590 Returns a pointer to a QAction that encapsulates the specified web action \a action. … … 593 594 return page()->action(action); 594 595 } 596 #endif 595 597 596 598 /*! -
trunk/WebKit/qt/Api/qwebview.h
r52065 r57327 76 76 QString selectedText() const; 77 77 78 #ifndef QT_NO_ACTION 78 79 QAction* pageAction(QWebPage::WebAction action) const; 80 #endif 79 81 void triggerPageAction(QWebPage::WebAction action, bool checked = false); 80 82 -
trunk/WebKit/qt/ChangeLog
r57323 r57327 1 2010-04-09 Tasuku Suzuki <tasuku.suzuki@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Fix compile error with QT_NO_ACTION 6 https://bugs.webkit.org/show_bug.cgi?id=36529 7 8 Make sure QT_NO_ACTION is not defined to use QAction 9 10 * Api/qgraphicswebview.cpp: 11 (QGraphicsWebView::pageAction): 12 * Api/qwebpage.cpp: 13 (QWebPagePrivate::updateAction): 14 (QWebPage::updatePositionDependentActions): 15 * Api/qwebpage.h: 16 * Api/qwebview.cpp: 17 * Api/qwebview.h: 18 1 19 2010-04-09 Simon Hausmann <simon.hausmann@nokia.com> 2 20
Note: See TracChangeset
for help on using the changeset viewer.