summaryrefslogtreecommitdiffstats
path: root/src/shared
Commit message (Collapse)AuthorAgeFilesLines
* Fix assorted QComboBox::currentIndexChanged overload compile errorsEdward Welbourne2020-03-261-3/+3
| | | | | Change-Id: I9d1c9126b526161aa58c9068bca30ef6dd1ac7fb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix deprecation warnings about QComboBox: deprecate currentIndexChanged(QString)Friedemann Kleint2020-02-131-3/+3
| | | | | | | | Fix warnings introduced qtbase/11dc7b35c8c3957bd19087a5e3ae7cfc4f1a3343. Task-number: QTBUG-81845 Change-Id: I49169c34ec9aaff3625bcb9dfaef1d29b7beae07 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
* Don't use deprecated QMatrix class anymoreJarek Kobus2020-01-102-4/+4
| | | | | | Task-number: QTBUG-46653 Change-Id: I62145c2ecb97a5f3538502303fbdb81ad33aded7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-284-21/+34
|\ | | | | | | Change-Id: I8d517708261431bb0cc5b88030756af989da6bd0
| * windeployqt: Refactor platform enumerationFriedemann Kleint2019-12-194-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make it a QFlags, providing operators - Remove WinCE - Add a Msvc compiler flag and make the tests for build directory and d-suffix depending on it. - Add clang-Msvc/clang-MinGW - Rename WindowsDesktop to WindowsDesktopMsvc, WinRtIntel to WinRtIntelMsvc and WinRtArm to WinRtArmMsvc - Use QFlags::testFlag() Task-number: QTBUG-80806 Task-number: QTBUG-80763 Task-number: QTBUG-78445 Change-Id: I0dd74a7b03e9e6bee55d4234c12eec17d52ce0e2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * windeployqt: Fix debug detection of "_app" versions of MSVC runtimeOliver Wolff2019-12-191-0/+3
| | | | | | | | | | | | | | | | | | | | UWP targets have the naming scheme of VCRUNTIMEXXX(d)_APP.dll. The "_APP" part, which is also mentioned in the comment, has to be taken into account when looking for the d "suffix" of the runtime library. Change-Id: Iea84687c7c3f230ac9520ca983e742b0938eec15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jiong Chang <xspeed1989@gmail.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-142-1/+6
|\| | | | | | | Change-Id: Iba365dc87ee3e96b2a44dad6bf4da436fd7b04f7
| * windeployqt: Fix MinGW deploymentFriedemann Kleint2019-12-132-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | The platform no longer has a 'd' suffix for debug binaries (see qtbase/4d289edb14aeb4976218cc306bfc514e37521b82). Add a check. Fixes: QTBUG-80763 Task-number: QTBUG-78445 Change-Id: I8d4617e2111167a546fa172cbca78a656d233ee5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-231-7/+6
|\| | | | | | | Change-Id: I8d40bdf8bf8d96b0fb01aec7c0e7ffaeb4209004
| * windeployqt: Fix detection of MSVC runtimeJiong Chang2019-11-211-7/+6
| | | | | | | | | | | | | | | | Detect msvcrt.dll without version number Change-Id: Ifafdc79c1b6497e1f6695b9c69d9d9fdd6cc2d94 Reviewed-by: Yuhang Zhao <2546789017@qq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-221-1/+1
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I5a2216b313c53ff7d42e02c0d91632550f3536ae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Qt Designer: Port QList->QVector for some internal classesFriedemann Kleint2019-11-201-1/+1
| | | | | | | | | | Change-Id: I10d9aba4e504f9759dcbedad84601eb3f1083b19 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Prepare for deprecation of classes in Qt 6Friedemann Kleint2019-11-1911-121/+113
| | | | | | | | | | | | | | | | | | - Use auto for QStringRef. - Use auto for QList and iterators, refactoring some loops. Task-number: QTBUG-79896 Change-Id: I065d5b6d49404e51a10a7e1d7373eff41f9cb032 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Fix Qt API usageFriedemann Kleint2019-11-154-10/+10
|/ | | | | | | | | | | | Replace: empty() by isEmpty() front()/back() by constFirst()/constLast(), preventing detaching Streamline some code. Task-number: QTBUG-79896 Change-Id: Ic3f8414db79a83a30b55369a9352f332b41aa621 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* windeployqt: Do not patch Qt5Core.dll unless necessaryFriedemann Kleint2019-11-051-7/+12
| | | | | | | | | | Check whether the content is already is patched to avoid unnecessarily touching files. Fixes: QTBUG-78732 Change-Id: I061927e8908793b78211b4634c3dc772c12c7915 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-021-1/+5
|\ | | | | | | Change-Id: Id63def71d27afe593d991478ebc44b7052194e47
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-301-1/+5
| |\ | | | | | | | | | Change-Id: I0e4b55a4dd87223f15a6933b45e5bcb8c41ee439
| | * Qt Designer: Enable editing of current datesFriedemann Kleint2019-07-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Designer uses QLocale::ShortFormat for its date editor, which has a 2 digit year. This causes the year to expanded to the wrong year (99->1999) for the maximum value and other issues. Fix by making the year 4 digits. Change-Id: I6cb73c5027f340706f44cd5fe3bfec5e90facb46 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Fix deprecation warningsFriedemann Kleint2019-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ../../../shared/qtgradienteditor/qtgradientstopswidget.cpp:963:31: warning: ‘int QWheelEvent::delta() const’ is deprecated: Use angleDelta() [-Wdeprecated-declarations] helpviewer_qtb.cpp:280:18: warning: ‘int QWheelEvent::delta() const’ is deprecated: Use angleDelta() [-Wdeprecated-declarations] shared/previewmanager.cpp:626:84: warning: 'void QWidget::getContentsMargins(int*, int*, int*, int*) const' is deprecated: use contentsMargins() [-Wdeprecated-declarations] mainwindow.cpp:2812:27: warning: ‘int QWheelEvent::delta() const’ is deprecated: Use angleDelta() [-Wdeprecated-declarations] Change-Id: Ib6e675b08d1c4445a2333676432129b765da8d0e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Eradicate the last Java-style iterators and mark the module free of themMarc Mutz2019-07-121-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and of QLinkedList. The change in QDesignerAbstractPropertySheetFactory is straight-forward. The rest are little buggers: - In macdeployqt, the code iterates inside an if. Weird, but portable. - In CppCodeParser, it's still somewhat harmless: just a call to std::remove_if to avoid running into quadratic complexity, even though the original loop had a good idea of iterating backwards, saving at least some copies in the process. Need to take care there that we continue to find the _first_ main.cpp, not the last, so add a check for mainCpp.isEmpty(). - In QtGradientStopsModel, however, needed to work around the absence of QMap::rbegin()/rend(), and it shows why they're missing: QMap's funky op* makes it impossible to just use std::reverse_iterator to do the heavy lifting. Use the recently-added QKeyValueIterator to get an approximation. I say 'approximation', because that one lacks operator->, so we need to use (*it).first, which brings back memories of Qt 2's iterators... Change-Id: I051e64b8d36b04ed2e7cf7695d9b797f08efaccb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Eradicate some easy Java-style iteratorsMarc Mutz2019-06-181-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Java-style iterators are scheduled for deprecation, or at the very least banned from use in Qt code. There are two more complicated ones left in the code for a later commit. Change-Id: I0c843ddcf2c67793b56ab99a219d36a0694c7b09 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Qt Designer: Replace Q_DISABLE_COPY by Q_DISABLE_COPY_MOVEFriedemann Kleint2019-06-0317-55/+55
|/ / | | | | | | | | | | | | | | Fix clang warnings like: warning: class '...' defines a default destructor, a copy constructor and a copy assignment operator but does not define a move constructor or a move assignment operator [cppcoreguidelines-special-member-functions Change-Id: I12ead44ddea8f6f69d75f99bea61e69ecac36db4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Fix deprecation warningsFriedemann Kleint2019-03-041-4/+4
| | | | | | | | | | | | | | | | | | shared/previewconfigurationwidget.cpp:268:34: warning: ‘DirectoryOnly’ is deprecated: Use setOption(ShowDirsOnly, true) instead [-Wdeprecated-declarations] dlg.setFileMode(QFileDialog::DirectoryOnly); shared/qttoolbardialog/qttoolbardialog.cpp:1139:31: warning: ‘TextColorRole’ is deprecated [-Wdeprecated-declarations] Change-Id: Ia989156baf35c2be6f763c067da9440d0b2c7dee Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | QtTools: replace deprecated QLayout::margin() with contentsMargins()Christian Ehrlicher2019-02-113-3/+3
| | | | | | | | | | | | | | | | QLayout::margin()/setMargin() is deprecated - replace it with it's successors contentsMargins()/setContentsMargins() Change-Id: I8b6a36f3e0d0e00186a7d9cdf4827cf06f302235 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix deprecation warningsFriedemann Kleint2019-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtpaths.cpp:114:19: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] qtpaths.cpp:218:21: warning: ‘static void QStandardPaths::enableTestMode(bool)’ is deprecated [-Wdeprecated-declarations] aboutdialog.cpp:144:81: warning: ‘const QRect QDesktopWidget::availableGeometry(const QPoint&) const’ is deprecated: Use QGuiApplication::screenAt() [-Wdeprecated-declarations] qtdocinstaller.cpp:66:70: warning: ‘QDir& QDir::operator=(const QString&)’ is deprecated: Use QDir::setPath() instead [-Wdeprecated-declarations] optionswidget.cpp:187:32: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] optionswidget.cpp:116:25: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] mainwindow.cpp:219:70: warning: ‘const QRect QDesktopWidget::screenGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] mainwindow.cpp:727:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] qdesigner_workbench.cpp:272:81: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qdesigner_workbench.cpp:577:51: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qdesigner_workbench.cpp:586:83: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] appfontdialog.cpp:355:41: warning: ‘void qStableSort(RandomAccessIterator, RandomAccessIterator) [with RandomAccessIterator = int*]’ is deprecated: Use std::stable_sort [-Wdeprecated-declarations] mainwindow.cpp:263:75: warning: ‘void qStableSort(RandomAccessIterator, RandomAccessIterator, LessThan) [with RandomAccessIterator = QToolBar**; LessThan = bool (*)(const QToolBar*, const QToolBar*)]’ is deprecated: Use std::stable_sort [-Wdeprecated-declarations] shared/qdesigner_menu.cpp:175:31: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_toolbar.cpp:406:31: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/actionrepository.cpp:321:33: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_menubar.cpp:316:35: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_tabwidget.cpp:220:73: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] Change-Id: I78d288be2e061dba03cbe72a77ca3b9742f79111 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-238-26/+26
| | | | | | | | | | Change-Id: Ia9258adbfed2b47e7c9d01354e23008d72566a4d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-044-15/+41
|\| | | | | | | | | | | | | | | | | Conflicts: src/qdoc/htmlgenerator.cpp src/qtattributionsscanner/qdocgenerator.cpp Done-With: Martin Smith <martin.smith@qt.io> Change-Id: I56a23175579a1a699939179da2f35bbcd6c73367
| * windeployqt: Replace typedef by usingFriedemann Kleint2018-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | Fix the respective Clang-tidy warning: utils.h:85: warning: use 'using' instead of 'typedef' [modernize-use-using] as displayed in the Qt Creator issues pane. Change-Id: Ide04ff3bc426ec55b9cdcc1b511119089d6750d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * windeployqt: Fix some Clang warningsFriedemann Kleint2018-12-123-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | - Use range-based for - Remove else after return - Use member initialization - Dubious check of bool * - Prefer static QFileInfo::exists() - Use uninitialized struct QJsonParseError Change-Id: If2705d6829ba3186cafb068a2c083943d33d1c66 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Enable Windeployqt to package arm64 desktop appsThomas Miller2018-12-072-5/+34
| | | | | | | | | | Change-Id: I8ef5ca54488e3e5cd89bd5a6e7be4958c74fe60d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Qt Designer: Add find functionality to the style sheet editorFriedemann Kleint2018-11-272-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | Add a helper createFindAction() to AbstractFindWidget to create the find action, factoring out duplicated code and add a TextFindWidget to the style sheet editor, similar to the code dialog. For modal dialogs, this requires overriding the key event handling of QDialog to prevent it from closing on Enter. Fixes: QTBUG-71650 Change-Id: Iecb78f9849936407248edf74cf3782cc34ff4e42 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer: Port away from deprecated ↵Friedemann Kleint2018-11-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | QTreeWidget::setItemExpanded()/isExpanded() qtbase/76bb804405f424708fffec502788995ea91206b8 deprecates those functions in favor of QTreeWidgetItem::setExpanded()/isExpanded(). Change-Id: I2949ceb5634bb90dced2a482c20b7a2f3be08d48 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-031-1/+1
|\| | | | | | | Change-Id: Icff4035509596e277f4612cdfa9363cdaa5371bf
| * winutils: Fix MinGW warnings about missing struct members initializersFriedemann Kleint2018-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::hwnd' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpVerb' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpFile' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpParameters' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpDirectory' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::nShow' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::hInstApp' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpIDList' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::lpClass' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::hkeyClass' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::dwHotKey' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::<anonymous>' [-Wmissing-field-initializers] ..\winutils\utils.cpp:317:39: warning: missing initializer for member '_SHELLEXECUTEINFOW::hProcess' [-Wmissing-f Use a default initializer. Change-Id: I0c6852093e7efa97ac0492012677d77a5e04190e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Support qmlimport option in windeployqtIlya Bizyaev2018-10-182-3/+5
|/ | | | | | | | | | This patch adds a new option, -qmlimport, which enables windeployqt to pass custom QML module import paths to qmlimportscanner. Change-Id: Iacde05543ab1f8f85b8306661e4674ad24badce4 Fixes: QTBUG-71045 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Fix clang-tidy warnings about class definitionsFriedemann Kleint2018-07-315-14/+14
| | | | | | | | | | | - Use ' = default' for trivial constructors/destructors - replace virtual by override or add override where applicable - Return *this from assignment operators of custom iterators - Replace trivial constructors by member initialization for simple structs - Add Q_DISABLE_COPY Change-Id: I67fb07cb82ccba93a41d58a8a0782628c9c681d9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* We no longer need a workaround to include PrivateWidgetsAndy Shaw2018-07-051-16/+1
| | | | | | | | | | The dependencies are in place so it is no longer necessary to include PrivateWidgets manually as it is correctly included automatically when necessary. Task-number: QTBUG-69299 Change-Id: I7cdebf8b3b4375b6f6c9360eb20676f406456ba6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-06-301-0/+2
|\ | | | | | | | | | | | | Conflicts: src/androiddeployqt/main.cpp Change-Id: I3df907e197b1b976f74562f1a9cce10261f166f3
* | winutils: Add possibility to run elevated background processesOliver Wolff2018-04-062-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to add localhost server support for winrt applications, we need to be able to run elevated applications in the background. As a preparation for this next patch, the new function is introduced. As winrtrunner is not supported on OSs other than Windows, it is fine to omit the implementation of this function on these operating systems for now. Change-Id: Iedb74a391e07a2b637f13bef84ad50c746dd8f0a Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Rename Windows(MinGW) to WindowsDesktop(MinGW) in Platform enumOliver Wolff2018-04-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | When used in connection with a winrt related header (roerrorapi.h) having an enum value Windows will lead to a symbol redefinition error, because Windows is used as a namespace name in there. Change-Id: Ie102b0d7a72ffb01c3a97f5f5f51b1645d46342b Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Move windows utilities into shared folderOliver Wolff2018-04-067-0/+2244
|/ | | | | | | | | | | An upcoming patch for winrtrunner will need to run an external executable. The utilities are moved to the shared folder to avoid code duplication Change-Id: I2be575432626ef796a6ebc95e55ac30ab3631b61 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-112-1/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ieef1b05234ee67bef28f2dc9abaa65f10840d21b
| * Fix includesJarek Kobus2018-01-102-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The missing headers were included indirectly through the QHeaderView, QButtonGroup or QAction inside the generated ui files. Now, the generated ui files won't include QHeaderView, QButtonGroup nor QAction, so we need to include the missing headers explicitly. Change-Id: Ie10d9fc23a6032be44fcb11a3c1d275f8437cb92 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Support years up to 9999 in dates and date-timesEdward Welbourne2017-12-011-1/+1
| | | | | | | | | | | | | | | | QDateTime and friends now do so, so the property manager should too. Change-Id: I3875bc0012957fdafa6f48897d943dcae0404832 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-203-3/+2
|\| | | | | | | | | | | | | Conflicts: src/qdoc/qdocdatabase.h Change-Id: I044c17d6a953c9689a4d928972d3fd757e468114
| * Qt Designer: Fix clazy-qenumsv5.10.0-beta3Friedemann Kleint2017-10-262-2/+2
| | | | | | | | | | Change-Id: Ia043a1ef5cb89f72a22121b22b3914e1d5220f84 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Revert "Fix use after free"Jesus Fernandez2017-10-251-1/+1
| | | | | | | | | | | | | | | | | | This reverts 112540645d78000ad8dfed1bca6662a10522aaf1. The deleted pointer is not dereferenced. The pointer value is used as the key in the map. QMap::remove uses the parameter as a number. Change-Id: I668d22a0ba21a2f6696b4dfefc617f363d7760d1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Qt Designer/Linguist/Assistant: Fix clazy-unused-non-trivial-variableFriedemann Kleint2017-10-251-1/+0
| | | | | | | | | | | | Change-Id: I45b89b7b0d33eb1e64daae1275661a79e27370df Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Fix use after freeJesus Fernandez2017-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This could cause an immediate crash or incorrect values might be read subsequently resulting in incorrect computations. In QtVariantPropertyManagerPrivate::​removeSubProperty(QtVariantProperty *): A pointer to freed memory is dereferenced, used as a function argument, or otherwise used (CWE-416) Coverity-Id: 22144 Change-Id: I0cd9c37769470e9c6f3d50fb53666b7db3e03c62 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix use after freeJesus Fernandez2017-10-231-1/+1
|/ | | | | | | | | | | | | This could cause an immediate crash or incorrect values might be read subsequently resulting in incorrect computations. In QtFlagPropertyManager::uninitializeProperty(QtProperty *): A pointer to freed memory is dereferenced, used as a function argument, or otherwise used (CWE-416) Coverity-Id: 22622 Change-Id: I24fc9d6f7c1c516ddcadaaba2ba7cdaed7c7f806 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 05:03:17 +0000