Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/demos/browser/browsermainwindow.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    434434    QMenu *toolsMenu = menuBar()->addMenu(tr("&Tools"));
    435435    toolsMenu->addAction(tr("Web &Search"), this, SLOT(slotWebSearch()), QKeySequence(tr("Ctrl+K", "Web Search")));
    436 #ifndef Q_CC_MINGW
    437436    a = toolsMenu->addAction(tr("Enable Web &Inspector"), this, SLOT(slotToggleInspector(bool)));
    438437    a->setCheckable(true);
    439 #endif
    440438
    441439    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
     
    673671            " new cookies are not stored, current cookies can't be accessed," \
    674672            " site icons wont be stored, session wont be saved, " \
    675             " and searches are not addded to the pop-up menu in the Google search box." \
     673            " and searches are not added to the pop-up menu in the Google search box." \
    676674            "  Until you close the window, you can still click the Back and Forward buttons" \
    677675            " to return to the webpages you have opened.").arg(title);
Note: See TracChangeset for help on using the changeset viewer.