Changeset 651 for trunk/tools/assistant/compat
- Timestamp:
- Mar 8, 2010, 12:52:58 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 29 edited
-
. (modified) (1 prop)
-
tools/assistant/compat/config.cpp (modified) (1 diff)
-
tools/assistant/compat/config.h (modified) (1 diff)
-
tools/assistant/compat/docuparser.cpp (modified) (1 diff)
-
tools/assistant/compat/docuparser.h (modified) (1 diff)
-
tools/assistant/compat/fontsettingsdialog.cpp (modified) (1 diff)
-
tools/assistant/compat/fontsettingsdialog.h (modified) (1 diff)
-
tools/assistant/compat/helpdialog.cpp (modified) (1 diff)
-
tools/assistant/compat/helpdialog.h (modified) (1 diff)
-
tools/assistant/compat/helpdialog.ui (modified) (1 diff)
-
tools/assistant/compat/helpwindow.cpp (modified) (1 diff)
-
tools/assistant/compat/helpwindow.h (modified) (1 diff)
-
tools/assistant/compat/index.cpp (modified) (1 diff)
-
tools/assistant/compat/index.h (modified) (1 diff)
-
tools/assistant/compat/lib/qassistantclient.cpp (modified) (1 diff)
-
tools/assistant/compat/lib/qassistantclient.h (modified) (1 diff)
-
tools/assistant/compat/lib/qassistantclient_global.h (modified) (1 diff)
-
tools/assistant/compat/main.cpp (modified) (1 diff)
-
tools/assistant/compat/mainwindow.cpp (modified) (2 diffs)
-
tools/assistant/compat/mainwindow.h (modified) (1 diff)
-
tools/assistant/compat/mainwindow.ui (modified) (1 diff)
-
tools/assistant/compat/profile.cpp (modified) (1 diff)
-
tools/assistant/compat/profile.h (modified) (1 diff)
-
tools/assistant/compat/tabbedbrowser.cpp (modified) (1 diff)
-
tools/assistant/compat/tabbedbrowser.h (modified) (1 diff)
-
tools/assistant/compat/tabbedbrowser.ui (modified) (1 diff)
-
tools/assistant/compat/topicchooser.cpp (modified) (1 diff)
-
tools/assistant/compat/topicchooser.h (modified) (1 diff)
-
tools/assistant/compat/topicchooser.ui (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.2 (added) merged: 650 /branches/vendor/nokia/qt/current merged: 649 /branches/vendor/nokia/qt/4.6.1 removed
- Property svn:mergeinfo changed
-
trunk/tools/assistant/compat/config.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/config.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/docuparser.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/docuparser.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/fontsettingsdialog.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/fontsettingsdialog.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/helpdialog.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/helpdialog.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/helpdialog.ui
r561 r651 3 3 <comment>********************************************************************* 4 4 ** 5 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).5 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 6 6 ** All rights reserved. 7 7 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/helpwindow.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/helpwindow.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/index.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/index.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/lib/qassistantclient.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/lib/qassistantclient.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/lib/qassistantclient_global.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/main.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/mainwindow.cpp
r631 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) … … 326 326 "<h3>%1</h3>" 327 327 "<p>Version %2</p></center>" 328 "<p>Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).</p>")328 "<p>Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).</p>") 329 329 .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR))); 330 330 box.setWindowTitle(tr("Qt Assistant")); -
trunk/tools/assistant/compat/mainwindow.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/mainwindow.ui
r561 r651 2 2 <comment>********************************************************************* 3 3 ** 4 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).4 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 5 5 ** All rights reserved. 6 6 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/profile.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/profile.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/tabbedbrowser.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/tabbedbrowser.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/tabbedbrowser.ui
r561 r651 3 3 <comment>********************************************************************* 4 4 ** 5 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).5 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 6 6 ** All rights reserved. 7 7 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/topicchooser.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/topicchooser.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/tools/assistant/compat/topicchooser.ui
r561 r651 2 2 <comment>********************************************************************* 3 3 ** 4 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).4 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 5 5 ** All rights reserved. 6 6 ** Contact: Nokia Corporation ([email protected])
Note:
See TracChangeset
for help on using the changeset viewer.
