| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Conflicts:
src/corelib/time/qdatetime.cpp
src/widgets/widgets/qcombobox.h
Change-Id: Ib84352e8fe34aed2986a1c94e7346a46a71c803b
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As planned when adding YearRange: now that it's merged up to dev, move
it to QDateTime, since we can add to the API at 5.14.0.
This follows up on commit 82ad4be4a2e0c2bccb6cd8ea2440aefee4ec48ec.
Change-Id: I81b6c2331121a71e2592514781c02c5756e70c52
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
RTEMS does not have "timezone" global variable.
Change-Id: Ifa4c6f8939270a83fb7b5ba623daafa1e9f81003
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix warning:
src/corelib/global/qnamespace.qdoc:2371: (qdoc) warning: Cannot find 'Qt::SplitBehavior' specified with '\enum' in any header file
and qdoc getting confused by a link spanning lines:
src/corelib/time/qdatetime.cpp:3324: (qdoc) warning: Unknown macro 'note'
src/corelib/time/qdatetime.cpp:3326: (qdoc) warning: Unknown macro 'section1'
src/corelib/time/qdatetime.cpp:3328: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3334: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3344: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3361: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3373: (qdoc) warning: Unknown macro 'e'
src/corelib/time/qdatetime.cpp:3378: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3386: (qdoc) warning: Unknown macro 'sa'
Change-Id: I314da69078eb07f66e9d389eecdf0195569ea2ce
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
|
|
|
|
| |
Conflicts:
.qmake.conf
src/network/ssl/qsslsocket_openssl.cpp
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Semi-automated, just needed ~20 manual fixes:
$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)load\(\)/$1loadRelaxed\(\)/g' -i \{\} +
$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)store\(/$1storeRelaxed\(/g' -i \{\} +
It can be easily improved (e.g. for store check that there are no commas
after the opening parens). The most common offender is QLibrary::load,
and some code using std::atomic directly.
Change-Id: I07c38a3c8ed32c924ef4999e85c7e45cf48f0f6c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change-Id: I250bfb58c04b2c013285c8ebd6db1f964f0b7b29
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/unix/unixmake2.cpp
src/corelib/thread/qthread_unix.cpp
tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The calendar APIs shall need fromShortMonthName() to know its year
number; so rearrange the date parsing that uses it to ensure the year
number is known in time. In the process, pass &ok to toInt() also for
the calls that get a day number (where failure's 0 return is an
adequate check for failed parse), just to be on the safe side.
Change-Id: Id09c40da9f7e70e68be440e9805a3d30a80977c6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
| |
Cleans up most of corelib to use nullptr or default enums
where appropriate.
Change-Id: Ifcaac14ecdaaee730f87f10941db3ce407d71ef9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
We'll be adding calendar code here as well, and tools/ was getting
rather crowded, so it looks like time to move out a reasonably
coherent sub-bundle of it all.
Change-Id: I7e8030f38c31aa307f519dd918a43fc44baa6aa1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|