summaryrefslogtreecommitdiffstats
path: root/src/widgets
Commit message (Collapse)AuthorAgeFilesLines
* QDirModel: remove pointless user-defined QDirNode destructorMarc Mutz2015-07-201-1/+0
| | | | | | | | | | The clearing of 'children' is already performed by the 'children' destructor, and the presence of the user-defined QDirNode destructor inhibits the move special member functions for QDirNode. Change-Id: Ie8025e7a2c4b1a8c0b691deda0e49b517f8a6ed5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Fix nullptr literal 0s which would look odd as nullptrMarc Mutz2015-07-1910-23/+23
| | | | | | | | | | | | | These all invoke the QFlags<>(Zero *) ctor, which is designed to accept a 0, but no other int. But in doing so, it requires passing a nullptr literal, and 0 is not a nullptr literal accepted under -Wzero-as-null-pointer-constant or similar warnings. Fix by using the QFlags::QFlags() ctor instead. Task-number: QTBUG-45291 Change-Id: I73f9c9f4de11eeb1ba04ace6c7121d17510ea29f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QFileSystemModel: reserve() a QListMarc Mutz2015-07-191-1/+3
| | | | | | Change-Id: I136c24382a869ef92446dbe79bfd6a64273e55c6 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* QFileSystemModel: avoid sibling() callsMarc Mutz2015-07-182-11/+6
| | | | | | | | | | | | | | | | ...by allowing to pass the column to the Private::index() overloads. Because Private::index() always returns an index in column 0, callers that needed a different column used QModelIndex::sibling() to adjust the column of the returned index. But that calls QAIM::sibling(), which calls both QFSM::index() and ::parent(). Simply allowing to pass the column number instead of hard-coding 0 avoids that heavy detour. Change-Id: I8895b3d102d576ba291333cf61075b7263f96b9d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: David Faure <david.faure@kdab.com>
* Add a way for auxiliary threads to handle events without CoreAppThiago Macieira2015-07-181-1/+3
| | | | | | | | | | | | | | Long-lived threads started by Qt itself can now receive events even if QCoreApplication hasn't been created. This is required in all threads we start that will handle events, unless we're sure that the thread will exit before the global application object begins destruction. Otherwise, those threads will have race conditions dealing with the event delivery system trying to call the QCoreApplication::notify() virtual while the object is being destroyed. Change-Id: I27eaacb532114dd188c4ffff13d4ad2a4bb443e6 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* QStyleSheetStyle: don't hold ButtonInfo in QListMarc Mutz2015-07-171-5/+7
| | | | | | | | | | | | | | | | | | | | ButtonInfo is larger than a void*, so holding them in a QList is needlessly inefficient. Worse, the code could come to depend on the fragile property of (inefficient) QLists that references to elements therein never are invalidated. Fix by holding it in QVector. Also reserve() the vector, even though we can't tell the size exectly. It's a short-lived vector. When appending, add an optimistic qMove(). I would have liked to use std::vector instead, but QRenderRule, thus ButtonInfo, isn't nothrow-move-constructible, because of missing move constructors on QBrush and QFont, among others. Change-Id: I89164f4ed5745498093102f022a7ef32186e8045 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Remove a silly note from QFileDialog::getOpenFileNames documentationGiuseppe D'Angelo2015-07-172-15/+0
| | | | | | | | | | | I can't possibly understand the meaning of the note, especially given the snippet. (However ,it has been there since Qt 3, so perhaps it refers to some weird QValueList behavior?) Change-Id: I952e9a7cb687b94cfccb927eb359b635804f4ade Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into HEAD" into ↵Simon Hausmann2015-07-177-12/+19
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/5.5' into HEADSimon Hausmann2015-07-177-12/+19
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe
| | * Don't complain about non-matching Qt versions in qwidget.cppThiago Macieira2015-07-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5bf67f5f41ab110eb41ab74f2a87e649735af435 did it for qobject.cpp, but I missed qwidget.cpp (I hadn't realized the test existed there too). Change-Id: Ib056b47dde3341ef9a52ffff13eeceafcfc64893 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * QWindowsVistaStyle: Don't use new style background on Controls ComboBoxGabriel de Dietrich2015-07-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use menus to implement the ComboBox popup in QtQuick Controls, and therefore, all the items are actual menu items. If that's the case, we can skip the new style background. Task-number: QTBUG-47084 Change-Id: If46ebf8115b36f45b4b5e6068ddc0d61afe307b8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | * QDial: remove documentation for non-existent functions.Mitch Curtis2015-07-141-3/+2
| | | | | | | | | | | | | | | | | | | | | f6dd3ab553a56d5e39da4bbb040b9136b88fa05b forgot to remove these. Change-Id: Ia10048d551b309ea3c49818ef51819c93a92c8d3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * QComboBox: Fix compilation with QT_NO_COMPLETERChristoph Schleifenbaum2015-07-131-0/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ie57b06ebbddaa0801e265e6908da1548fe02085a Task-number: QTBUG-46871 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| | * Windows XP style: Pass widget to XPThemeData.Friedemann Kleint2015-07-102-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, 0 was passed which causes QWindowsXPStylePrivate::winId() to go on a hunt trying to find a window handle needlessly looping over top levels, slowing down painting. Task-number: QTBUG-42245 Change-Id: Ic702d9a73c4f749fd5988950280aef632a3308c4 Reviewed-by: Marko Kangas <marko.kangas@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * docs: QGraphicsWidget: Remove outdated statementSérgio Martins2015-07-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | It might get new features, but it probably won't so don't create false expectations. Change-Id: Icbdae9242822798c681f75988c968fc9e6f0d081 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * Remove stray period in QGraphicsItem documentation.Mitch Curtis2015-07-011-1/+1
| | | | | | | | | | | | | | | Change-Id: I2f66be1c54bb6b57b9ca41ba619e14d78443f81d Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | QFileDialog: add setSupportedSchemes and pass it along to the QPA.David Faure2015-07-172-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also finishes the implementation of the static methods which were being passed a supportedSchemes argument but weren't using it. Now they can pass it along to the QFileDialog instance, which then passes it to the helper used by the QPA implementation of the file dialog. The default implementation only supports local files and can therefore ignore this, but other implementations can use this argument to restrict the protocols allowed to the user. [ChangeLog][Widgets][QFileDialog] Add supportedSchemes property. Change-Id: I5235f70e785da1c06866a8355ef98f571890c4a2 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Doc: fix punctuation and missing word in QFileDialog docu.David Faure2015-07-171-8/+8
| | | | | | | | | | | | | | | Change-Id: I7388eda21bcea755db07c8b9603ec4e5f521c2fd Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | | Polish the widgets/mainwindows/sdi example.Friedemann Kleint2015-07-171-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce Qt 5 signals & slot syntax. - Use QCommandLineParser to obtain file arguments, factor out positioning into tile() function to be able to use it from command line and open/new slots. - Merge MainWindow::createMenus()/createQToolBars() into MainWindow::createActions(), removing the need to store the actions as member variables. Use QMenu::addAction() for brevity. - Use QIcon::fromTheme() to obtain system icons and use resource icons as fallback. - Rewrite settings code to use QWidget::saveGeometry(), Widget::restoreGeometry() since saving size and position does not work well with multiple screens. Query the available size when determining the initial size instead of using hard-coded values for High-DPI screens. - Fix minor issues in code, use multi-argument version of QString::arg(), QDir::toNativeSeparators() to present file paths to the user and and static method invocation. - Fix snippet references accordingly. Change-Id: I3ea0372bc7ff82247192f54620289352fb68d60f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QMainWindow: Remove dockwidgets from the floating tabs when pluggingOlivier Goffart2015-07-161-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example on how to reproduce the bug with examples/widgets/mainwindows/mainwindow: - Select the option "Groupped Dragging" from the "Main window" menu - Drag and drop dock widget so there are at least three of them in the same group of tabs (for example red, black, and green) - Drag the tab bar of one of them outside to make it floating (for example black) - Drag away the group of two remaining tabs to make them floating - Drack back the floating-alone (black) dock widget somewhere back inside the main window. => The black dock widget is tabbed with the other instead of being where we put it That's because it was still inactive (skipped) in the tab group. Task-number: QTBUG-47209 Change-Id: I84ac33d4ca1df0381c6007486b41830bd7be99a8 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | QStyleSheetStyle: mark QRenderRule and ButtonInfo movableMarc Mutz2015-07-161-0/+2
| | | | | | | | | | | | | | | | Because they are. Change-Id: Iab029e4b120f10efc99d62960b88fbba7603cc1b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QFileSystemModel: add a symbolic constant for the number of columnsMarc Mutz2015-07-162-1/+3
| | | | | | | | | | | | | | | | There are other literal 4's used in the implementation, so disambiguate. Change-Id: I5b0e4ac0018f9d5734e3de8b4f75259e175b23d3 Reviewed-by: David Faure <david.faure@kdab.com>
* | QStyleSheetStyle: scope a ButtonInfo object betterMarc Mutz2015-07-161-5/+6
| | | | | | | | | | | | | | | | | | Only one of the three following branches actually uses the ButtonInfo object, so create it only in that branch. Change-Id: I65c1d45d807258ed3352018c088bb4c4c66f9b84 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QStyleSheetStyle: remove empty QRenderRule dtorMarc Mutz2015-07-161-1/+0
| | | | | | | | | | | | | | | | | | Prevents the compiler from synthesizing move assignment operators for QRenderRule, thus ButtonInfo. Change-Id: I3a4d67198606a7b84eeb9f454f4e076deb70d048 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QStyleSheetStyle: separate data and functions in QRenderRuleMarc Mutz2015-07-161-7/+10
| | | | | | | | | | | | | | | | | | | | In preparation of marking it movable. For this, it is important to have a good overview over the data members. Distributing them among the function members is not helpful for that. Fix. Change-Id: I29e6e270c698ce32f7e58e083e6205bdba9c1362 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QtWidgets: mark some private types movable or primitiveMarc Mutz2015-07-138-0/+12
| | | | | | | | | | | | | | | | They are held in Qt containers or QVariant. Change-Id: Ida1b904120d4fb53a5596f1c3cbc973bd2ca315e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QLineEdit: don't hold SideWidgetEntry's in a QListMarc Mutz2015-07-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | SideWidgetEntry is larger than a void*, so holding it in QList is needlessly inefficient. Worse, the code could come to depend on the fragile property of (inefficient) QLists that references to elements therein never are invalidated. Fix by marking it movable, and holding in a QVector instead. Change-Id: Ia87b9ac634ad9386bc667355e6e236bc3d56ab29 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | widgets: add missing qheaderview_p.h to itemviews.priMarc Mutz2015-07-131-0/+1
| | | | | | | | | | Change-Id: I35ddca35ba7b3ef4f6587b6d4db6a58a60576e6f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | QAbstractItemView: don't hold QItemViewPaintPair in a QListMarc Mutz2015-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QItemViewPaintPair is larger than a void*, so holding it in QList is needlessly inefficient. Worse, the code could come to depend on the fragile property of (inefficient) QLists that references to elements therein never are invalidated. Fix by holding in a QVector instead (was already marked movable as a QPair of movable types). Change-Id: I6f4042d2df306ecf0ec576ecbc6678736268014e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QGraphicsItem: don't hold ExtraStruct in a QListMarc Mutz2015-07-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | ExtraStruct is larger than a void*, so holding it in QList is needlessly inefficient. Worse, the code could come to depend on the fragile property of (inefficient) QLists that references to elements therein never are invalidated. Fix by marking it movable, and holding in a QVector instead. Change-Id: I02f2089859c2deccf0e6c451bf80da07893cc3f0 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QMenu: don't hold QPointers in QListMarc Mutz2015-07-132-9/+9
| | | | | | | | | | | | | | | | | | | | | | QPointer is larger than a void*, so holding them in a QList is needlessly inefficient. Worse, the code could come to depend on the fragile property of (inefficient) QLists that references to elements therein never are invalidated. Change-Id: Ia224a4fe01acc1d4ca9b57c62941dd0f37780c67 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Polish the widgets/mainwindows/application example.Friedemann Kleint2015-07-132-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce Qt 5 signals & slot syntax - Use QCommandLineParser to obtain file arguments - Merge MainWindow::createMenus()/createQToolBars() into MainWindow::createActions(), removing the need to store the actions as member variables. Use QMenu::addAction() for brevity. - Use QIcon::fromTheme() to obtain system icons and use resource icons as fallback. - Rewrite settings code to use QWidget::saveGeometry(), Widget::restoreGeometry() since saving size and position does not work well with multiple screens. Query the available size when determining the initial size instead of using hard-coded values for High-DPI screens. - Fix minor issues in code, use multi-argument version of QString::arg(), QDir::toNativeSeparators() to present file paths to the user. - Fix snippet references accordingly. Change-Id: I1bc49a8913aa6d669e0e666f04be3f1f42eaba10 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix some qdoc-warnings.Friedemann Kleint2015-07-105-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtbase/src/corelib/io/qdatastream.cpp:501: warning: Undocumented enum item 'Qt_5_6' in QDataStream::Version qtbase/src/corelib/itemmodels/qitemselectionmodel.cpp:1764: warning: Undocumented parameter 'model' in QItemSelectionModel::setModel() qtbase/src/corelib/statemachine/qabstractstate.cpp:216: warning: Undocumented parameter 'active' in QAbstractState::activeChanged() qtbase/src/corelib/statemachine/qstatemachine.cpp:3262: warning: Undocumented parameter 'running' in QStateMachine::runningChanged() qtbase/src/corelib/tools/qchar.cpp:160: warning: Undocumented enum item 'Unicode_7_0' in QChar::UnicodeVersion qtbase/src/gui/image/qimagereader.cpp:1168: warning: Undocumented parameter 'enabled' in QImageReader::setAutoTransform() qtbase/src/gui/image/qimagewriter.cpp:621: warning: Undocumented parameter 'transform' in QImageWriter::setTransformation() qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:1268: warning: Undocumented parameter 'tristate' in QStandardItem::setAutoTristate() qtbase/src/gui/kernel/qscreen.cpp:590: warning: Undocumented parameter 'orientation' in QScreen::orientationChanged() qtbase/src/gui/kernel/qscreen.cpp:599: warning: Undocumented parameter 'orientation' in QScreen::primaryOrientationChanged() qtbase/src/gui/text/qtextdocument.cpp:1455: warning: No such parameter 'from' in QTextDocument::find() qtbase/src/gui/text/qtextdocument.cpp:533: warning: Undocumented parameter 'option' in QTextDocument::setDefaultTextOption() qtbase/src/widgets/itemviews/qtableview.cpp:2546: warning: Undocumented parameter 'enable' in QTableView::setSortingEnabled() qtbase/src/widgets/statemachine/qkeyeventtransition.cpp:119: warning: Undocumented parameter 'key' in QKeyEventTransition::setKey() qtbase/src/widgets/widgets/qplaintextedit.cpp:1610: warning: Can't link to 'toText()' qtbase/src/opengl/qgl.cpp:4371: warning: No documentation for 'QGLWidget::event()' Remove the documentation as they are properties: qtbase/src/widgets/widgets/qfontcombobox.cpp:407: warning: Undocumented parameter 'font' in QFontComboBox::setCurrentFont() qtbase/src/widgets/widgets/qfontcombobox.cpp:403: warning: Undocumented parameter 'script' in QFontComboBox::setWritingSystem() Change-Id: If599a3ce747bbb8a3418dd973810923b87246371 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | QComboBox::setView only delete the old view if it is a childThorbjørn Martsum2015-07-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | We have ownership for a reason - and there seems to be no good reason not to accept it here. [ChangeLog][QtWidgets][QComboBox] QComboBox::setView no longer deletes the old view directly. It now checks the ownership first. Change-Id: Icb5e5c0a6e9dc93c1d1c1a90ff57fbcc0786aa60 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Bring back OS X key handling.Morten Johan Sørvig2015-07-081-2/+2
| | | | | | | | | | Change-Id: I15c8972d09db18f47d17cddb65dda5d1b829e54e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Remove Q_DEAD_CODE_FROM_QT4_MAC sectionMorten Johan Sørvig2015-07-081-3/+0
| | | | | | | | | | | | | | | | Its not known if the call to flush() is required in Qt 5. It has been compiled out until now; remove it. Change-Id: I7033e02af8ac7ea2a357d1287e368b541d1d6776 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* | Remove Q_DEAD_CODE_FROM_QT4 sections.Morten Johan Sørvig2015-07-081-6/+0
| | | | | | | | | | Change-Id: Ia29bd4f2c6837dbfb7c5833dfd4f5ec42a33622d Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* | Fix inefficient code foreaching on container.values()Sérgio Martins2015-07-082-3/+3
| | | | | | | | | | | | | | Saves one full iteration and memory allocation. Change-Id: Ice527499b5f5f62bd1e47d76fdf40119948ee3a1 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | QMainWindowLayout::hover does not need to return a valueOlivier Goffart2015-07-072-9/+7
| | | | | | | | | | | | | | | | The return value of the function is never used Change-Id: I75e51bce36eedd42f5527ddb86efd434fe11551d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | QLabelPrivate: separate data and function members, avoid paddingMarc Mutz2015-07-072-43/+47
| | | | | | | | | | | | | | | | | | sizeof(QLabelPrivate) only goes down from 640 to 632 (on 64-bit), but we now have a non-conditional data member as the last member, so the ctor-init-list doesn't look quite so ugly anymore. Change-Id: I51f7e56d92cfcca4f35128595c829e2f3f887c72 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | QLabelPrivate: de-inline ctorMarc Mutz2015-07-072-34/+44
| | | | | | | | | | | | | | | | | | | | | | ...and move most of the init() code into the ctor-init-list. Saves 176B of text size on Linux AMD64 GCC 4.9 optimized C++11 builds. Change-Id: I6cd42e19c40a031456eaf626e32619aed1758a6c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | QtWidgets: Use Q_NULLPTR instead of 0 in all public headersMarc Mutz2015-07-0698-298/+298
| | | | | | | | | | | | | | | | | | This is in preparation of adding -Wzero-as-null-pointer-constant (or similar) to the headers check. Task-number: QTBUG-45291 Change-Id: Ie67d235151ca8d4ef5e721c9cf4a6fd32bd167a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Make QWidget *=0, Qt::WindowFlags f=0 functions use Q_NULLPTRMarc Mutz2015-07-0417-32/+36
| | | | | | | | | | | | | | | | | | This is in preparation of adding -Wzero-as-null-pointer-constant (or similar) to the headers check. Task-number: QTBUG-45291 Change-Id: If9721e8b1ab3b4cd6e3e366362cae314f451bbed Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Use const-ref in foreach if T is big or non-trivialSérgio Martins2015-07-041-1/+1
| | | | | | | | | | | | | | | | Criteria: Linux x86_64, sizeof(T) > 8 Change-Id: I78c2b776ff219fa1ff6632fde17ae25fae66c54e Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-07-0148-165/+159
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
| * QFileIconEngine: Remove reference to QFileIconProviderGabriel de Dietrich2015-06-301-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping the reference may end up in a crash if a created QIcon outlives the QFileIconProvider and we then try to generate a pixmap. The reference is not necessary since the options are queried only when creating the icon, so they can be saved in the icon provider. Task-number: QTBUG-46755 Change-Id: I5c60887c2ed39030a2a20298ff10fd652189e4e7 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| * Switch to new not deprecated apiAndreas Holzammer2015-06-301-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | SPI_GETPLATFORMTYPE is deprecated as of Windows Embedded Compact 2013, SPI_GETPLATFORMNAME is a full replacement. Use this instead because it produces deprecation messages and slows down execution. Task-number: QTBUG-46916 Change-Id: I7f162b488dd0b1aa256c47a9e76358df101e3d0f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * Replace MAC OS X with OS XNico Vertriest2015-06-3034-80/+80
| | | | | | | | | | | | Task-number: QTBUG-46374 Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into ↵Liang Qi2015-06-283-9/+3
| |\ | | | | | | | | | refs/staging/5.5
| | * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-273-9/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.h Manually fixed src/testlib/qtestcase.cpp to return the right type. Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 21:18:23 +0000