Changeset 651 for trunk/tools/qtconfig
- Timestamp:
- Mar 8, 2010, 12:52:58 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 21 edited
-
. (modified) (1 prop)
-
tools/qtconfig/colorbutton.cpp (modified) (1 diff)
-
tools/qtconfig/colorbutton.h (modified) (1 diff)
-
tools/qtconfig/main.cpp (modified) (1 diff)
-
tools/qtconfig/mainwindow.cpp (modified) (2 diffs)
-
tools/qtconfig/mainwindow.h (modified) (1 diff)
-
tools/qtconfig/mainwindowbase.cpp (modified) (1 diff)
-
tools/qtconfig/mainwindowbase.h (modified) (1 diff)
-
tools/qtconfig/mainwindowbase.ui (modified) (1 diff)
-
tools/qtconfig/paletteeditoradvanced.cpp (modified) (1 diff)
-
tools/qtconfig/paletteeditoradvanced.h (modified) (1 diff)
-
tools/qtconfig/paletteeditoradvancedbase.cpp (modified) (1 diff)
-
tools/qtconfig/paletteeditoradvancedbase.h (modified) (1 diff)
-
tools/qtconfig/paletteeditoradvancedbase.ui (modified) (1 diff)
-
tools/qtconfig/previewframe.cpp (modified) (1 diff)
-
tools/qtconfig/previewframe.h (modified) (1 diff)
-
tools/qtconfig/previewwidget.cpp (modified) (1 diff)
-
tools/qtconfig/previewwidget.h (modified) (1 diff)
-
tools/qtconfig/previewwidgetbase.cpp (modified) (1 diff)
-
tools/qtconfig/previewwidgetbase.h (modified) (1 diff)
-
tools/qtconfig/previewwidgetbase.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/qtconfig/colorbutton.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/colorbutton.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/main.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/mainwindow.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 1000 1000 box.setText(tr("<h3>%1</h3>" 1001 1001 "<br/>Version %2" 1002 "<br/><br/>Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).")1002 "<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).") 1003 1003 .arg(tr("Qt Configuration")).arg(QLatin1String(QT_VERSION_STR))); 1004 1004 box.setWindowTitle(tr("Qt Configuration")); -
trunk/tools/qtconfig/mainwindow.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/mainwindowbase.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/mainwindowbase.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/mainwindowbase.ui
r561 r651 3 3 <comment>********************************************************************* 4 4 ** 5 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).5 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 6 6 ** All rights reserved. 7 7 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/paletteeditoradvanced.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/paletteeditoradvanced.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/paletteeditoradvancedbase.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/paletteeditoradvancedbase.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/paletteeditoradvancedbase.ui
r561 r651 3 3 <comment>********************************************************************* 4 4 ** 5 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).5 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 6 6 ** All rights reserved. 7 7 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/previewframe.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/previewframe.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/previewwidget.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/previewwidget.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/previewwidgetbase.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/previewwidgetbase.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/tools/qtconfig/previewwidgetbase.ui
r561 r651 3 3 <comment>********************************************************************* 4 4 ** 5 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).5 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 6 6 ** All rights reserved. 7 7 ** Contact: Nokia Corporation (qt-info@nokia.com)
Note:
See TracChangeset
for help on using the changeset viewer.
