diff options
34 files changed, 79 insertions, 75 deletions
diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf index d6c6b00e99..a484e00e17 100644 --- a/doc/global/qt-html-templates-online.qdocconf +++ b/doc/global/qt-html-templates-online.qdocconf @@ -38,7 +38,7 @@ HTML.headerstyles = \ HTML.endheader = \ "</head>\n" \ "<body>\n" \ - "<div class=\"header\" id=\"qtdocheader\"></div>\n" + "<div class=\"header\" id=\"qtdocheader\"></div>\n" \ " <header>\n" \ " <div class=\"nav\">\n" \ " <a href=\"http://qt-project.org/\">Qt Home</a>\n" \ diff --git a/examples/widgets/doc/src/classwizard.qdoc b/examples/widgets/doc/src/classwizard.qdoc index 038f9e19b2..b4224a182f 100644 --- a/examples/widgets/doc/src/classwizard.qdoc +++ b/examples/widgets/doc/src/classwizard.qdoc @@ -28,6 +28,7 @@ /*! \example dialogs/classwizard \title Class Wizard Example + \ingroup examples-dialogs \brief The License Wizard example shows how to implement linear wizards using QWizard. diff --git a/examples/widgets/doc/src/configdialog.qdoc b/examples/widgets/doc/src/configdialog.qdoc index 0fdbc5ddd0..18c14b79e3 100644 --- a/examples/widgets/doc/src/configdialog.qdoc +++ b/examples/widgets/doc/src/configdialog.qdoc @@ -28,6 +28,7 @@ /*! \example dialogs/configdialog \title Config Dialog Example + \ingroup examples-dialogs \brief The Config Dialog examples shows how a configuration dialog can be created by using an icon view with a stacked widget. diff --git a/examples/widgets/doc/src/extension.qdoc b/examples/widgets/doc/src/extension.qdoc index 0ba1d0738e..423a829167 100644 --- a/examples/widgets/doc/src/extension.qdoc +++ b/examples/widgets/doc/src/extension.qdoc @@ -28,6 +28,7 @@ /*! \example dialogs/extension \title Extension Example + \ingroup examples-dialogs \brief The Extension example shows how to add an extension to a QDialog using the QAbstractButton::toggled() signal and the diff --git a/examples/widgets/doc/src/findfiles.qdoc b/examples/widgets/doc/src/findfiles.qdoc index 27d0cacade..61dbf05581 100644 --- a/examples/widgets/doc/src/findfiles.qdoc +++ b/examples/widgets/doc/src/findfiles.qdoc @@ -28,6 +28,7 @@ /*! \example dialogs/findfiles \title Find Files Example + \ingroup examples-dialogs \brief The Find Files example shows how to use QProgressDialog to provide feedback on the progress of a slow operation. The example also diff --git a/examples/widgets/doc/src/licensewizard.qdoc b/examples/widgets/doc/src/licensewizard.qdoc index aee60e11fe..e45c162f29 100644 --- a/examples/widgets/doc/src/licensewizard.qdoc +++ b/examples/widgets/doc/src/licensewizard.qdoc @@ -28,6 +28,7 @@ /*! \example dialogs/licensewizard \title License Wizard Example + \ingroup examples-dialogs \brief The License Wizard example shows how to implement complex wizards in Qt. diff --git a/examples/widgets/doc/src/standarddialogs.qdoc b/examples/widgets/doc/src/standarddialogs.qdoc index f9d9372a70..4b39ac64c5 100644 --- a/examples/widgets/doc/src/standarddialogs.qdoc +++ b/examples/widgets/doc/src/standarddialogs.qdoc @@ -28,6 +28,7 @@ /*! \example dialogs/standarddialogs \title Standard Dialogs Example + \ingroup examples-dialogs \brief The Standard Dialogs example shows the standard dialogs that are provided by Qt. diff --git a/examples/widgets/doc/src/tabdialog.qdoc b/examples/widgets/doc/src/tabdialog.qdoc index e2ac57550f..b3e74389af 100644 --- a/examples/widgets/doc/src/tabdialog.qdoc +++ b/examples/widgets/doc/src/tabdialog.qdoc @@ -28,6 +28,7 @@ /*! \example dialogs/tabdialog \title Tab Dialog Example + \ingroup examples-dialogs \brief The Tab Dialog example shows how to construct a tab dialog using the QTabWidget class. diff --git a/examples/widgets/doc/src/trivialwizard.qdoc b/examples/widgets/doc/src/trivialwizard.qdoc index c67bb09c0d..4ccee9a625 100644 --- a/examples/widgets/doc/src/trivialwizard.qdoc +++ b/examples/widgets/doc/src/trivialwizard.qdoc @@ -28,6 +28,7 @@ /*! \example dialogs/trivialwizard \title Trivial Wizard Example + \ingroup examples-dialogs \brief The Trivial Wizard example illustrates how to create a linear three-page registration wizard using three instances of QWizardPage and one instance diff --git a/mkspecs/common/gcc-base-unix.conf b/mkspecs/common/gcc-base-unix.conf index dc8d7e42cd..dadaecaa29 100644 --- a/mkspecs/common/gcc-base-unix.conf +++ b/mkspecs/common/gcc-base-unix.conf @@ -15,6 +15,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += QMAKE_LFLAGS_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATHLINK = -Wl,-rpath-link, # -Bsymbolic-functions (ld) support QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf index 67e16f2d29..322a19d05b 100644 --- a/mkspecs/devices/linux-imx6-g++/qmake.conf +++ b/mkspecs/devices/linux-imx6-g++/qmake.conf @@ -8,7 +8,7 @@ # /home/tsenyk/qt5/qt5/configure -opensource -confirm-license -make libs -device imx6 \ # -device-option CROSS_COMPILE=/opt/freescale/usr/local/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/arm-fsl-linux-gnueabi- \ # -sysroot <path-to-your-ltib-install>/rootfs -no-gcc-sysroot \ -# -prefix /usr/local/Trolltech/Qt5-imx6-1 +# -prefix /usr/local/Qt-5.0.0/Qt5-imx6-1 # # NOTE: currently ltib doesn't produce a proper staging/sysroot-filessystem. # If gcc's --sysroot is used, the toolchain doesn't find basic binaries (e.g. crt1.o), diff --git a/mkspecs/devices/linux-tegra2-g++/qmake.conf b/mkspecs/devices/linux-tegra2-g++/qmake.conf index c480def19c..c846801a10 100644 --- a/mkspecs/devices/linux-tegra2-g++/qmake.conf +++ b/mkspecs/devices/linux-tegra2-g++/qmake.conf @@ -4,7 +4,7 @@ # This mkspec is based and tested on the TrimSlice using "Ubuntu Natty (11.04) - l4t.r15.01"-release. # It might work with other boards and releases as well. # A typical configure line looks like this: -# <path-to-qt-src>/configure -opensource -confirm-license -make libs -prefix /usr/local/Trolltech/Qt5-tegra2 +# <path-to-qt-src>/configure -opensource -confirm-license -make libs -prefix /usr/local/Qt-5.0.0/Qt5-tegra2 # -device tegra2 -device-option CROSS_COMPILE=<path-to-crosstoolchain>/bin/arm-none-linux-gnueabi- \ # -sysroot <path-to-rootfs> -no-neon diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index d73d402b0c..ec5becbdde 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -115,12 +115,12 @@ defineTest(qtAddModule) { PRE_TARGETDEPS *= $$MODULE_LIBS/$${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} # Make sure we can link to uninstalled libraries - unix:!mac:!isEmpty(QT.$${1}.libs) { # Use unmodified path, so /usr/lib also works + !isEmpty(QT.$${1}.libs) { # Use unmodified path, so /usr/lib also works for(rpl, QT.$${1}.rpath_link): \ - QMAKE_LFLAGS *= -Wl,-rpath-link,$$rpl + QMAKE_RPATHLINKDIR *= $$rpl !auto_use_privates:!isEqual(2, UsePrivate): \ for(rpl, QT.$${1}.rpath_link_private): \ - QMAKE_LFLAGS *= -Wl,-rpath-link,$$rpl + QMAKE_RPATHLINKDIR *= $$rpl } } # Only link to this module if a libs directory is set, else this is just a module @@ -139,6 +139,7 @@ defineTest(qtAddModule) { export(QMAKE_LFLAGS) export(QMAKE_LIBDIR) export(QMAKE_RPATHDIR) + export(QMAKE_RPATHLINKDIR) export(PRE_TARGETDEPS) return(true) } diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 82fd47f2ec..8a1a29c2c7 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -170,6 +170,13 @@ UnixMakefileGenerator::init() project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath()); } } + if (!project->isEmpty("QMAKE_RPATHLINKDIR")) { + const ProStringList &rpathdirs = project->values("QMAKE_RPATHLINKDIR"); + for (int i = 0; i < rpathdirs.size(); ++i) { + if (!project->isEmpty("QMAKE_LFLAGS_RPATHLINK")) + project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATHLINK") + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath()); + } + } if(project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS")) include_deps = true; //do not generate deps diff --git a/qmake/property.cpp b/qmake/property.cpp index d9e861c2e6..bbd4734622 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -105,7 +105,7 @@ QMakeProperty::~QMakeProperty() void QMakeProperty::initSettings() { if(!settings) { - settings = new QSettings(QSettings::UserScope, "Trolltech", "QMake"); + settings = new QSettings(QSettings::UserScope, "QtProject", "QMake"); settings->setFallbacksEnabled(false); } } diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 79f1bd1b49..0ef08227a4 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -205,7 +205,7 @@ QColorDialogStaticData::QColorDialogStaticData() : customSet(false) void QColorDialogStaticData::readSettings() { #ifndef QT_NO_SETTINGS - const QSettings settings(QSettings::UserScope, QStringLiteral("Trolltech")); + const QSettings settings(QSettings::UserScope, QStringLiteral("QtProject")); for (int i = 0; i < int(CustomColorCount); ++i) { const QVariant v = settings.value(QStringLiteral("Qt/customColors/") + QString::number(i)); if (v.isValid()) @@ -218,7 +218,7 @@ void QColorDialogStaticData::writeSettings() const { #ifndef QT_NO_SETTINGS if (!customSet) { - QSettings settings(QSettings::UserScope, QStringLiteral("Trolltech")); + QSettings settings(QSettings::UserScope, QStringLiteral("QtProject")); for (int i = 0; i < int(CustomColorCount); ++i) settings.setValue(QStringLiteral("Qt/customColors/") + QString::number(i), customRgb[i]); } diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 229275d7c7..179db9964f 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -113,35 +113,6 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged) - // ------------------------------------------------------------------------ - // Temporary backwards-compatibility properties to be removed ASAP - Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle) - Q_PROPERTY(QString windowFilePath READ windowFilePath WRITE setWindowFilePath) - Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon) - Q_PROPERTY(Qt::WindowModality windowModality READ windowModality WRITE setWindowModality NOTIFY windowModalityChanged) - -public: - - Qt::WindowModality windowModality() const { return modality(); } - void setWindowModality(Qt::WindowModality wm) { setModality(wm); } - void setWindowFlags(Qt::WindowFlags f) { setFlags(f); } - Qt::WindowFlags windowFlags() const { return flags(); } - Qt::WindowType windowType() const { return type(); } - QString windowTitle() const { return title(); } - void requestActivateWindow() { requestActivate(); } - bool requestWindowOrientation(Qt::ScreenOrientation o) { return requestOrientation(o); } - Qt::ScreenOrientation windowOrientation() const { return orientation(); } - void setWindowFilePath(const QString &fp) { setFilePath(fp); } - QString windowFilePath() const { return filePath(); } - void setWindowIcon(const QIcon &i) { setIcon(i); } - QIcon windowIcon() const { return icon(); } - void setWindowTitle(const QString &t) { setTitle(t); } - -Q_SIGNALS: - void windowModalityChanged(Qt::WindowModality windowModality); - // End of temporary backwards-compatibility properties - // ------------------------------------------------------------------------ - public: explicit QWindow(QScreen *screen = 0); @@ -240,13 +211,6 @@ public: inline void setPosition(const QPoint &pt) { setGeometry(QRect(pt, size())); } inline void setPosition(int posx, int posy) { setPosition(QPoint(posx, posy)); } -// Temporary backwards-compatible accessors for the benefit of Declarative -// to be removed ASAP - inline void setFramePos(const QPoint &pt) { setFramePosition(pt); } - inline void setPos(const QPoint &pt) { setPosition(pt); } - inline void setPos(int posx, int posy) { setPosition(posx, posy); } -// end of temporary accessors - void resize(const QSize &newSize); inline void resize(int w, int h) { resize(QSize(w, h)); } diff --git a/src/gui/painting/qmath_p.h b/src/gui/painting/qmath_p.h index c710ee462a..bc7bb320b7 100644 --- a/src/gui/painting/qmath_p.h +++ b/src/gui/painting/qmath_p.h @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE static const qreal Q_PI = qreal(3.14159265358979323846); // pi static const qreal Q_2PI = qreal(6.28318530717958647693); // 2*pi static const qreal Q_PI2 = qreal(1.57079632679489661923); // pi/2 +static const qreal Q_MM_PER_INCH = 25.4; inline int qIntSqrtInt(int v) { diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp index cb727a9d2c..a705b18dc5 100644 --- a/src/network/socket/qlocalserver_tcp.cpp +++ b/src/network/socket/qlocalserver_tcp.cpp @@ -67,7 +67,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName) else fullServerName = prefix + requestedServerName; - QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt")); + QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); if (settings.contains(fullServerName)) { qWarning("QLocalServer::listen: server name is already in use."); tcpServer.close(); @@ -87,7 +87,7 @@ bool QLocalServerPrivate::listen(qintptr socketDescriptor) void QLocalServerPrivate::closeServer() { - QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt")); + QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); if (fullServerName == QLatin1String("QLocalServer")) settings.setValue(fullServerName, QVariant()); else @@ -126,7 +126,7 @@ bool QLocalServerPrivate::removeServer(const QString &name) else serverName = prefix + name; - QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt")); + QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); if (settings.contains(serverName)) settings.remove(serverName); diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 5429d8dc36..913d10f50a 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -238,7 +238,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) else d->fullServerName = prefix + name; - QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt")); + QSettings settings(QLatin1String("QtProject"), QLatin1String("Qt")); bool ok; const quint16 port = settings.value(d->fullServerName).toUInt(&ok); if (!ok) { diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf index 2d8703a1dc..a605e8bd4c 100644 --- a/src/opengl/doc/qtopengl.qdocconf +++ b/src/opengl/doc/qtopengl.qdocconf @@ -41,11 +41,12 @@ qhp.qtopengl.namespace = org.qt-project.qtopengl.500 # Title for the package, will be the main title for the package in # Assistant/Creator. -qhp.qtopengl.indexTitle = Qt Script Documentation +qhp.qtopengl.indexTitle = Qt OpenGL # Only update the name of the project for the next variables. qhp.qtopengl.virtualFolder = qtopengl qhp.qtopengl.subprojects = classes -qhp.qtopengl.subprojects.classes.title = Qt D-Bus C++ Classes +qhp.qtopengl.subprojects.classes.title = C++ Classes +qhp.qtopengl.subprojects.classes.indexTitle = Qt OpenGL C++ Classes qhp.qtopengl.subprojects.classes.selectors = class fake:headerfile qhp.qtopengl.subprojects.classes.sortPages = true diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp index 32d20e6aaa..df665cea84 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp @@ -75,7 +75,7 @@ void QEglFSWindow::create() if (m_window) return; - if (window()->windowType() == Qt::Desktop) { + if (window()->type() == Qt::Desktop) { QRect rect(QPoint(), hooks->screenSize()); QPlatformWindow::setGeometry(rect); QWindowSystemInterface::handleGeometryChange(window(), rect); diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp index 593bec8458..8b413de4fb 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.cpp +++ b/src/plugins/platforms/qnx/qqnxscreen.cpp @@ -425,7 +425,7 @@ void QQnxScreen::addWindow(QQnxWindow *window) // Such a situation would strangely break focus handling due to the // invisible desktop widget window being layered on top of normal // windows - if (window->window()->windowType() == Qt::Desktop) + if (window->window()->type() == Qt::Desktop) m_childWindows.push_front(window); else m_childWindows.push_back(window); diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index e4505c6c60..787f371ca6 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -511,8 +511,8 @@ void QQnxWindow::setScreen(QQnxScreen *platformScreen) Q_FOREACH (QQnxWindow *childWindow, m_childWindows) { // Only subwindows and tooltips need necessarily be moved to another display with the window. - if ((window()->windowType() & Qt::WindowType_Mask) == Qt::SubWindow || - (window()->windowType() & Qt::WindowType_Mask) == Qt::ToolTip) + if ((window()->type() & Qt::WindowType_Mask) == Qt::SubWindow || + (window()->type() & Qt::WindowType_Mask) == Qt::ToolTip) childWindow->setScreen(platformScreen); } diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 6452186bbf..4f0c3ba6bb 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -50,6 +50,7 @@ #include <QDebug> #include <qpa/qwindowsysteminterface.h> +#include <private/qmath_p.h> QT_BEGIN_NAMESPACE @@ -242,8 +243,8 @@ QImage::Format QXcbScreen::format() const QDpi QXcbScreen::logicalDpi() const { - return QDpi(25.4 * m_virtualSize.width() / m_virtualSizeMillimeters.width(), - 25.4 * m_virtualSize.height() / m_virtualSizeMillimeters.height()); + return QDpi(Q_MM_PER_INCH * m_virtualSize.width() / m_virtualSizeMillimeters.width(), + Q_MM_PER_INCH * m_virtualSize.height() / m_virtualSizeMillimeters.height()); } QPlatformCursor *QXcbScreen::cursor() const @@ -315,6 +316,9 @@ void QXcbScreen::handleScreenChange(xcb_randr_screen_change_notify_event_t *chan QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), geometry()); QWindowSystemInterface::handleScreenAvailableGeometryChange(QPlatformScreen::screen(), availableGeometry()); QWindowSystemInterface::handleScreenOrientationChange(QPlatformScreen::screen(), m_orientation); + QWindowSystemInterface::handleScreenLogicalDotsPerInchChange(QPlatformScreen::screen(), + Q_MM_PER_INCH * m_virtualSize.width() / m_virtualSizeMillimeters.width(), + Q_MM_PER_INCH * m_virtualSize.height() / m_virtualSizeMillimeters.height()); } void QXcbScreen::updateGeometry(xcb_timestamp_t timestamp) diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index fc8b62d75e..88652271af 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -363,7 +363,7 @@ QFileDialog::QFileDialog(const QFileDialogArgs &args) QFileDialog::~QFileDialog() { #ifndef QT_NO_SETTINGS - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); settings.setValue(QLatin1String("filedialog"), saveState()); #endif @@ -2229,7 +2229,7 @@ void QFileDialogPrivate::init(const QString &directory, const QString &nameFilte q->setFileMode(QFileDialog::AnyFile); #ifndef QT_NO_SETTINGS - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); if (!directory.isEmpty()) setLastVisitedDirectory(workingDirectory(directory)); diff --git a/src/widgets/doc/images/dialog-examples.png b/src/widgets/doc/images/dialog-examples.png Binary files differnew file mode 100644 index 0000000000..26537b5de3 --- /dev/null +++ b/src/widgets/doc/images/dialog-examples.png diff --git a/src/widgets/doc/src/qtwidgets-examples.qdoc b/src/widgets/doc/src/qtwidgets-examples.qdoc index b321942a70..07e1eb135c 100644 --- a/src/widgets/doc/src/qtwidgets-examples.qdoc +++ b/src/widgets/doc/src/qtwidgets-examples.qdoc @@ -95,3 +95,20 @@ */ + +/*! + \group examples-dialogs + \ingroup all-examples + \title Dialog Examples + \brief Using Qt's standard dialogs and building and using custom dialogs. + + \image dialog-examples.png + + Qt includes standard dialogs for many common operations, such as file + selection, printing, and color selection. + + Custom dialogs can also be created for specialized modal or modeless + interactions with users. +*/ + + diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index b975474c8f..40208f6e6d 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -650,12 +650,12 @@ void tst_QSettings::testByteArray() // write { - QSettings settings("Trolltech", "tst_qsettings"); + QSettings settings("QtProject", "tst_qsettings"); settings.setValue("byteArray", data); } // read { - QSettings settings("Trolltech", "tst_qsettings"); + QSettings settings("QtProject", "tst_qsettings"); QByteArray ret = settings.value("byteArray", data).toByteArray(); QCOMPARE(ret, data); } @@ -1896,7 +1896,7 @@ void tst_QSettings::testEmptyData() } { - QSettings settings("Trolltech", "tst_qsettings"); + QSettings settings("QtProject", "tst_qsettings"); settings.setValue("nullString", nullString); settings.setValue("emptyString", emptyString); settings.setValue("emptyList", emptyList); @@ -1909,7 +1909,7 @@ void tst_QSettings::testEmptyData() QVERIFY(settings.status() == QSettings::NoError); } { - QSettings settings("Trolltech", "tst_qsettings"); + QSettings settings("QtProject", "tst_qsettings"); QCOMPARE(settings.value("nullString").toString(), nullString); QCOMPARE(settings.value("emptyString").toString(), emptyString); QCOMPARE(settings.value("emptyList").toStringList(), emptyList); diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index 76c047a076..1b53eabdde 100644 --- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -121,7 +121,7 @@ public: tst_QAbstractNetworkCache::tst_QAbstractNetworkCache() { - QCoreApplication::setOrganizationName(QLatin1String("Trolltech")); + QCoreApplication::setOrganizationName(QLatin1String("QtProject")); QCoreApplication::setApplicationName(QLatin1String("autotest_qabstractnetworkcache")); QCoreApplication::setApplicationVersion(QLatin1String("1.0")); } diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 8ce0742854..952f5eaeea 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -166,7 +166,7 @@ tst_QFiledialog::~tst_QFiledialog() void tst_QFiledialog::init() { // Save the developers settings so they don't get mad when their sidebar folders are gone. - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); userSettings = settings.value(QLatin1String("filedialog")).toByteArray(); settings.remove(QLatin1String("filedialog")); @@ -180,7 +180,7 @@ void tst_QFiledialog::init() void tst_QFiledialog::cleanup() { - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); settings.setValue(QLatin1String("filedialog"), userSettings); } diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 6b0888f68a..b0c48a6558 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -165,7 +165,7 @@ void tst_QFileDialog2::init() QVERIFY(tempDir.isValid()); // Save the developers settings so they don't get mad when their sidebar folders are gone. - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); userSettings = settings.value(QLatin1String("filedialog")).toByteArray(); settings.remove(QLatin1String("filedialog")); @@ -179,7 +179,7 @@ void tst_QFileDialog2::init() void tst_QFileDialog2::cleanup() { - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); settings.beginGroup(QLatin1String("Qt")); settings.setValue(QLatin1String("filedialog"), userSettings); } diff --git a/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp b/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp index 9a44b26505..660eb075b2 100644 --- a/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp +++ b/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp @@ -629,7 +629,7 @@ static const char charData[] __attribute__((aligned(64))) = { // #126 "\377\376" - "Trolltech" + "QtProject" "\377\376\375\374\373" // 3328 // #127 @@ -827,7 +827,7 @@ static const char charData[] __attribute__((aligned(64))) = { "\377\376\375\374\373\372\371\370\367\366\365\364\363\362\361\360" // 4544 // #166 - "Trolltech" + "QtProject" "\377\376\375\374\373\372\371" // 4560 // #167 @@ -980,7 +980,7 @@ static const char charData[] __attribute__((aligned(64))) = { "\377\376\375\374\373" // 5488 // #197 - "Trolltech" + "QtProject" "\377\376\375\374\373\372\371" // 5504 // #198 @@ -6955,7 +6955,7 @@ static const char charData[] __attribute__((aligned(64))) = { "\377\376\375" // 58688 // #1425 - "Trolltech" + "QtProject" "\377\376\375\374\373\372\371" // 58704 // #1426 @@ -28453,7 +28453,7 @@ static const char charData[] __attribute__((aligned(64))) = { "\377\376" // 268688 // #5853 - "Trolltech" + "QtProject" "\377\376\375\374\373\372\371" // 268704 // #5854 diff --git a/tests/manual/lance/widgets.h b/tests/manual/lance/widgets.h index e5e21f4b35..a95658d215 100644 --- a/tests/manual/lance/widgets.h +++ b/tests/manual/lance/widgets.h @@ -99,7 +99,7 @@ public: m_filename(file), m_view_mode(RenderView) { - QSettings settings("Trolltech", "lance"); + QSettings settings("QtProject", "lance"); for (int i=0; i<10; ++i) { QPointF suggestion(100 + i * 40, 100 + 100 * qSin(i * 3.1415 / 10.0)); m_controlPoints << settings.value("cp" + QString::number(i), suggestion).toPointF(); @@ -154,7 +154,7 @@ public: ~OnScreenWidget() { - QSettings settings("Trolltech", "lance"); + QSettings settings("QtProject", "lance"); for (int i=0; i<10; ++i) { settings.setValue("cp" + QString::number(i), m_controlPoints.at(i)); } |
