| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
shared/widgetdatabase.cpp:371:66: warning: typedef 'NameItemMap' locally defined but not used [-Wunused-local-typedefs]
tools/designer/src/lib/shared/previewmanager.cpp:820:16: warning: converting ‘false’ to pointer type ‘QWidget*’ [-Wconversion-null]
Task-number: QTBUG-44747
Change-Id: I9781a8cbce1def5229fe0ed7071c04ae6880b039
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
|
|
|
|
|
|
|
| |
Bump year to 2015 in all but source code comments.
Change-Id: I1dd7972dee65a86a9bd560ead32bbd0cbe82f439
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
|
|
| |
- Update copyright year to 2015
- Update copyright holder to The Qt Company Ltd
Change-Id: I2ed489f82639c93344051de38491183987a743e1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Icd6fcdb59eb1b9fd8de555ef1c1c87a379f06a27
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This could happen because insertContents() is called once for
every run of the content provider, even if an invalidation happens
in between. Example sequence:
run()
invalidate() [removes result of first run]
run()
insertContents() [queued for first run, retrieves result of second run]
insertContents() [queued for second run, retrieves empty data]
We now check in insertContents() whether the content provider has a
valid root item and do nothing if it does not. This means that
insertContents() will never replace the current model data with empty
data; only invalidateContents() can do that from now on.
Further improvements:
- Only call insertContents() if the run was not aborted; this
reduces the number of useless objects in the event queue.
- Remove the m_rootItem member; it was only used in the run() function.
- Only add the root item to the list at the end of a successful run;
there is no reason this object should be accessible from the outside
while there are still children being added to it.
Change-Id: I80e2ea93dd9bbc8ab7f406c989b61f16f11b6eea
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
1) Make sure invalidateContents() is called whenever the help engine's
DB readers are destroyed.
2) In QHelpContentProvider::stopCollecting(), remove all root items, as
they are invalid now: Their child items reference DB readers that
are going to be destroyed.
Task-number: QTBUG-18829
Change-Id: Iab3245eb9fd405f28105aa08a976d9a108b9c70a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
On windows the debug version of qmlplugindumper used to show a panel on
assert failure. Failure should be silent.
Done-with: Thomas Hartmann <thomas.hartmann@digia.com>
Task-number: QTCREATORBUG-12644
Change-Id: I568f27e7d848aeafbffa059599f33b1b7ce0d2b9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
| |
Backported from change 6481e28ba0d696cf41a2a5bc32b01db85f95b333 in qtbase
Task-number: QTBUG-36480
Change-Id: I3625d57a2f7b7b2f763a4cb92f19025b0401c593
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes a regression in the new MinGW packages that are now built
with mkspec win32-g++-4.6: Since we failed to detect this as a MinGW
mkspec we missed to check for headers in all relevant paths, which
disabled windowsxp, windosvista styles by default.
This commit does not apply to Qt 5, similar issues there are being
fixed independently.
[ChangeLog][Windows] configure.exe now detects newer MinGW versions
correctly, enabling windowsxp and windowsvista styles by default.
Task-number: QTBUG-38706
Change-Id: Ib4e7af69e8040aaa28940f501cce5572588d4378
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
WebKit needs this as a base url in order to resolve links in css for
example. If index.html is at the location doc/, and it loads a css
stylesheet at href="_static/first.css", and first.css contains
@import url("second.css")
Then second.css should be found in _static, relative to first.css.
That only works if WebKit knows the requested url of the loading
document, so make sure that is set on the reply object.
This is a backport of part of commit qttools/e38ee135f3cf74f413dc7a3e4a9f97a6b5d903bf
Task-number: QTCREATORBUG-8211
Change-Id: Ia92519ab37269a6d3f8bf0e4f8b348595f1f3d59
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Handle the case of it being PropertySheetStringValue.
Task-number: QTBUG-37602
Change-Id: Iff54d6409ffabf48406fcfec96289848a42b3e55
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/9ee8213c7becfdf906ca781df4895e18b273e023)
|
|
|
|
|
|
|
| |
Fix regression introduced in (incomplete) commit 95f256d21dd.
Change-Id: I319f214a38134b5b97164ec61b2ae482e6542b86
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
6626e5f41712723405c110a4f11ad650116f7523 did it on the wrong line.
This problem does not exist in Qt 5.
Change-Id: Ia39bc69b3f5ad58d28994ef3cae00242a8d0adbb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
|
|
|
|
|
|
|
|
|
| |
MinGW-w64 has '64' too, but isn't necessarily a 64 bit build ...
But the variable wasn't used anyway, so we can as well just remove
the check.
Change-Id: Ifba3ce344c5dc5e692f105bc99081ae4c69c779c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make sure that the version check works for gcc e.g. from mingw-builds,
which contains spaces in the version info, e.g.
g++ (i686-posix-dwarf, Built by MinGW-W64 project) 4.8.2
In Qt 5, support for MinGW-gcc versions older than 4.6 was dropped.
Change-Id: Idac5fb3a8cd01200558032ea1bd997e30f0e8b8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-24587
Change-Id: I1384403e5c5e3313649fa4abb98e7578cae4677b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qttools/92020773c1739feb4dc240827271720f615431d0)
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-27974
Change-Id: I30edae2db5449605984a118458b1ccce7ad67eb1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qttools/bcaa8575352ad16e1f6020436e1a3f450eefd53e)
|
|
|
|
|
|
|
|
|
| |
Backport of --noinstantiate option from Qt 5.0.
Task-number: QTBUG-36380
Change-Id: I80694aa94c5d5cceaf2751d1e3efc80e4f316709
Signed-off-by: Daniel Pesch <dpesch@blackberry.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add mkspec win32-msvc2013 and make VS 2013 known to configure and
qmake.
Task-number: QTBUG-36135
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from commit f1cdd4b2976706c6d9c3166a75afff6ec5856f3d)
Change-Id: I6a6d1ce0de0ba85e1b711976c7340893c58e29ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When reading the registry on a 64 bit Windows, the same compiler
can be detected twice, breaking the -platform detection even when
only one compiler is in the path.
Fix this by taking advantage of the CompilerInfo struct ordering
and ignore detection of the same compiler.
Change-Id: I583230520d2e0859196f9d7c8af31adbb981a6ca
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit fa5cf01e7468e53508b15726625fd681892119a4)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Mac's strip tool doesn't work if the file is read-only. Some of the
libraries we copy might be read-only (like those installed by
HomeBrew) and that would cause stripping to fail.
(cherry-picked from qttools commit f82499e6508975188b38cb396280c901e4274cd7)
Change-Id: Ie8caa853a26794ec97ec84354d9f7bb142cce993
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
|
|
|
|
|
|
| |
Change-Id: I792f3060c808ef860b31b47b3b00e5ac1991eedd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/3455a96c6728873a3ba69585ebb27bf8e733c0f9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far qsqlite tried to open the file first read/write, and falling back
to read access only if this fails. This has resulted in excessively long
loading times e.g. on Windows XP.
Task-number: QTCREATORBUG-10697
(cherry-picked from commit 0bf84aa7873edd7bb411fabb94481b03d1501c68 in
qttools.git)
Change-Id: I94be15e2d7c5845bcadf6b32e54462a7c1bcb98a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QStackedWidgetPreviewEventFilter::updateButtonToolTip()
The local variable 'className' is no longer used, since at some point
in time, it was replaced with the query stackedClassName(), a file-
static function.
So remove the code that sets it.
Change-Id: I2ee7dedc66acfa10949b628499c52f87dab02e7a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qttools/c98012e7a6b6287ec13b8ca4a4d08ed584f7ee8a)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Access the control property of the QAxWidget directly.
Task-number: QTBUG-34592
Change-Id: I7d0971ad8fc265d0443da7ae72330e2b7f3a8d70
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qttools/611ac50c1ed80bd6c6c15f2b39e720b6f7c1acb8)
|
|
|
|
|
|
|
| |
Task-number: QTBUG-34171
Change-Id: Ib5fe8194d891eb999e41bafde19834be56c84103
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/78d8ee2513bdf52da2e0141be93dfe7bab8a1488)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
we execute foreach loops now. this is (mostly) safe nowadays, because
a previous change added precautions against exponential value list
growth, so it's unlikely that two nested loops would keep the cpu busy
for a day as before.
we continue to exclude forever loops and loops with excessive integer
counts.
Task-number: QTBUG-8550
Change-Id: Iaa116086986cc7fd5023834753f791dd205102e5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qttools/dd4d594c787a62fa8aa12695c5d115c71b59bacd)
|
|
|
|
|
|
|
|
|
|
| |
Decode text stream from QML files as UTF-8 even when the latter
is not the default system encoding (QML supports UTF-8 only).
Cherry picked from qttools/441f3d964301942e417b238b6e71
Change-Id: I9cc75854ffb610deccba6c7d3c8ddaf61f6da120
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removed deprecated "all rights reserved" strings
Changed contact details to qt-project.org/legal
Used the following command:
find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E
'.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee
>(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{
s/(^[ \t:#*;/"\\-]*)([a-z ]*)(Copyright.*Nokia.*)/
\1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I
}}') >(xargs sed -i -r '1,50 s/(^[ \t:#*;/"\\-]*)
(.*info@qt\.nokia\.com.*|.*INSERT EMAIL ADDRESS.*
|.*qt-info@nokia\.com.*|.*qt-label1@nokia\.com.*
|.*http:\/\/qt\.nokia\.com\/contact.*|.*qt-sales@nokia\.com.*
|.*http:\/\/www\.qt-project\.org\/.*)/
\1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs
sed -i -r '1,50{/(^[ \t:#*;/"\\-]*)(all rights reserved.*)/Id}')
Change-Id: Ic57037fd897a54440e4bad0939ee2bf9f1dfcd5d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
| |
Change-Id: I91189c8c33591ef866a4478c113f93162afede95
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
They were not handled at all, children were just reparented
resulting in the morphed widgets being appended.
Task-number: QTBUG-31911
Change-Id: Idae8f66663416d514a2f3c299e58d726a3dd578a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/d251ee9dcbd015f2acbe76231902b72163cd05a2)
|
|
|
|
|
|
|
|
| |
Embed Info.plist in qmlplugindump executable in a special way.
Change-Id: Ia83cf15a1dc8c7e37560a280bd711ff2e4468ad8
(adpated from qtdeclarative/4d173d5f16c103f640d4089feed44a74b14e9004)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was disabled before, but
2bba0eadc1570f29331285738b9d319687f84d4c
enabled it per default.
Change-Id: Ic5a8e50d116cf6b15719668faf055967a6f34e06
(cherry picked from commit 45750b18187ef257a986cf6ab8b2c97ef3ba6e52)
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
* explicit -relocatable will allows us to change the default to
nonrelocatable.
* add support for both -notrelocatable and the grammatically correct
-nonrelocatable.
* backport from qt5
Change-Id: I0f5335e2cf86ba2eda7ad80b4f7271b8b6ddcada
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
| |
based on qt5/qtbase: a9ba92740670ddbbcb0c68f80ad1a18cf2ff0598
Change-Id: Ie036d502950f5e3c0b0297d480af6cfd351e3db0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
It currently loads source files as latin1, which means other encodings
are not supported.
Qt 5 change: c4f1ac0fbcd452f440aee4a3304574cb7fbca0ce
Task-number: QTBUG-27238
Change-Id: Ieb4de351d93bd5ac2939692c5c53bd681fea4386
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I2775c2cf4a3a2b1295d389da665e5e8aadea21e9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: Ife495cb67b9b378cbf2668157752219a98c6b435
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
|
|
|
|
|
|
| |
This fix isn't needed in Qt5 as the code doesn't exist there.
Change-Id: Icb8e0b45e5bc926cf0432ec3c990bc703f7b7b04
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-25872
Change-Id: Ia311b88f0ed3450d798bc5a9136e978c642d5b25
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/eb456f72052b02a77e22868bfa55a25d7af3e660)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The property is a QString when set by the menu or a
PropertySheetStringValue when loading the form.
Breakage introduced by
8695c1753964eeb06b5d9306010b56be5fc151c0 .
Task-number: QTBUG-29234
Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
(cherry picked from qttools/3e43b158ce158dc1285593d2c7555351033fc3ce)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
bring it to the state of 5.0.2: both QT_CONFIG and CONFIG in qconfig.pri
contain the respective flag, so it is a) visible how qt was built and b)
user code has a consistent default.
before, on windows we had it only in qconfig.pri's CONFIG (so it was
harder to find the qt config), and on unix we had it only in
.qmake.cache's CONFIG (so it was impossible to find the qt config in a
clean way, and there was no default (other than some arbitrary mess
inside qmake itself)).
Change-Id: Iad06de8c4435cec3e1407babde037ac96cb5bf66
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In cases where the Propertiesdialog has no specific Implementation
for a dbus data type, it creates a regular QLineEdit. In such cases,
qdbusviewer then tried to call the method with the arg set to a string
instead of the real datatype (for example uint64), which usually does not work.
We can be more clever and try to implicitely convert the user input
to the right datatype, which makes the invocation succeed.
Change-Id: I9e16be6e7c5209745f2fa0c32acf08a3c42178f1
(cherry-pick of qttools/0c22eb9d9d1a0b72622fdf16ebf60712336b449e)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
| |
On Windows, filePath() was used for a function that was supposed to get
the bin directory for Qt. However path() should be used instead as this
will remove the filename from the originally obtained string.
Change-Id: I16f8bda91fe9666c935318f8d73c715d2ea908f5
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit 05dab891649b76fe7351d51950edf3caba2bfece)
|
|
|
|
|
|
| |
Change-Id: I62fa2443cc7cfd187458eb99d370472d553600f8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-26394
Change-Id: Idbaa4bad71125b74d8407bb56ee9fdbf83831fe0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/a7d61534acdb90b925d7f250665dcd30c3f37668)
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-29234
Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/8695c1753964eeb06b5d9306010b56be5fc151c0)
|
|
|
|
|
|
|
|
|
| |
Drop the read and write permissions for group and other users in the
system.
Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
Reviewed-by: Richard J. Moore <rich@kde.org>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|