From 6d13e9f29597e0d557857e3f80173faba5368424 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 26 Mar 2012 09:16:03 +0200
Subject: Use "qt-project.org" instead of "trolltech" in the resource system

Task-number: QTBUG-23272

Change-Id: Idcdb9620910577b3c0fc9a792a0446665bd2eab6
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/widgets/dialogs/qmessagebox.cpp | 2 +-
 src/widgets/dialogs/qmessagebox.qrc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/widgets/dialogs')

diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index ec24f09b77..2b932b0724 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -1771,7 +1771,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
     msgBox->setText(translatedTextAboutQtCaption);
     msgBox->setInformativeText(translatedTextAboutQtText);
 
-    QPixmap pm(QLatin1String(":/trolltech/qmessagebox/images/qtlogo-64.png"));
+    QPixmap pm(QLatin1String(":/qt-project.org/qmessagebox/images/qtlogo-64.png"));
     if (!pm.isNull())
         msgBox->setIconPixmap(pm);
 #if defined(Q_OS_WINCE)
diff --git a/src/widgets/dialogs/qmessagebox.qrc b/src/widgets/dialogs/qmessagebox.qrc
index 8e6d7af671..de217773ec 100644
--- a/src/widgets/dialogs/qmessagebox.qrc
+++ b/src/widgets/dialogs/qmessagebox.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/trolltech/qmessagebox">
+<qresource prefix="/qt-project.org/qmessagebox">
    <file>images/qtlogo-64.png</file>
 </qresource>
 </RCC>
-- 
cgit v1.2.3


From 1b29481f3bac0b1fd950a59251af8ead0c5b0bd4 Mon Sep 17 00:00:00 2001
From: Debao Zhang <dbzhang800@gmail.com>
Date: Wed, 28 Mar 2012 14:36:48 -0700
Subject: Documentation cleanup

They are comments of Qt3 support members which have been removed already.

Change-Id: I4b3dfaac1e5e1c3c13b83e41d0505dd16a4b6a8e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/widgets/dialogs/qcolordialog.cpp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/widgets/dialogs')

diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 263d3a623c..569a10653f 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -2000,12 +2000,3 @@ QT_END_NAMESPACE
 
 #endif // QT_NO_COLORDIALOG
 
-/*!
-    \fn QColor QColorDialog::getColor(const QColor &init, QWidget *parent, const char *name)
-    \compat
-*/
-
-/*!
-    \fn QRgb QColorDialog::getRgba(QRgb rgba, bool *ok, QWidget *parent, const char *name)
-    \compat
-*/
-- 
cgit v1.2.3