| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: If9fb1309335e61e9133ece8fd12c8033a447d6b4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
|
|
| |
Mostly trailing whitespace
Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|
|
|
|
|
| |
Change-Id: Ia8f481b1473a2194d87cf7df00966917c3a4e341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
|
|
|
|
| |
Makes sure Qt Creator integrates nicely e.g. with gtk.
Task-number: QTCREATORBUG-11406
Change-Id: I4da11b42e9d407ee8456c6d43479839667ee13c1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
|
|
|
|
|
|
|
| |
os.environ["LLVM_INSTALL_DIR"] throws an exception if the key is not in
the dictionary.
Change-Id: I0e9dc9dbaf5612db3c530a436161211b6f0351af
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I0c7abe70dd45216d15a9a62d87c0fda8105cf9a8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I4393a3e955e3810eea79221233c82c80a9de119e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I19753fab58dae1e430adc76b96af4ef7ea690995
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Ia60d4bc3fd8899da51e3c71ef6a514fb3f52f1e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I408d2170575c99a690af53d32b08318e6060f525
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
| |
Change-Id: Ief673c06f0456fe1055447383c9fbef5a112d69c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
|
| |
Change-Id: I2fcaa0149fb6fbe65a8a0041823abe5c86db3bba
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
| |
Change-Id: I4d100538e05e2669908df5b0a0cc2156da181863
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
| |
Change-Id: I6ec2744379751708bbd1f36816dba7e5b976270d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
diskimages-helper: resize request is above maximum size allowed.
Change-Id: I6cc8da465d99fdb971d5e66090163464c85ccec1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
A guess is that hdiutil finishes even though the system is not yet quite
finished with the image (e.g. still unmounting?), so introducing a small
timer.
Also turn on verbosity, so this error might be better trackable if it
occurs again.
Change-Id: I0acb23bbac408f2979c8cacf2fc58fdff782fc3d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
| |
They can't be directly in libexec path, because then they couldn't have
their own qt.conf for resolving the Cocoa platform plugin.
Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Since we are using Qt Quick 2 now, Qt Creator also needs to find the Qt
Quick 2 imports.
Also make qmlpuppet (Qt Quick 1) optional for deploying Qt.
Task-number: QTBUG-33545
Change-Id: I296e4b3a1827f7b26841e94e15eda718afef81d0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
| |
Reflect that in the name
Change-Id: I8c7f81b0ff3b24e63401c6bbb90c9ad622c6ed0d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
| |
Change-Id: Iee20c93bca26a0e9849e88e14605f1703347e331
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: If595bccab1ebc16d894cf703cccedd7957b78edc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is required at least with Qt 5.1 / Linux.
Task-number: QTCREATORBUG-8471
Change-Id: I7342193ef40fcc1a3e523d787c7521d6e810cd61
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Icf83c978cd576e0d23e5183d688ef0c96210d484
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/qtquick/qtquick-components.qdoc
doc/src/qtquick/qtquick-designer.qdoc
qtcreator.pri
qtcreator.qbs
src/plugins/cppeditor/cppinsertdecldef.cpp
src/plugins/qnx/qnxruncontrolfactory.cpp
Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
|
| |
| |
| |
| |
| |
| |
| | |
Don't try to deploy qt quick 2 imports if they aren't there.
Change-Id: I1146ad8a81973af9e80c82caad515fea45b1530e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-9235
Change-Id: I9fae92bd9c1a07066d7d312008a7e10613b414f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The patching of imports and plugins is done automatically by macdeployqt,
we need to pass it the qml2puppet executable though.
Also add Qml2Imports to the qml(2)puppet's qt.conf.
Task-number: QTCREATORBUG-9136
Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|/
|
|
|
|
|
|
| |
Usually defines the file as "to be run if possible" by Linux file
browsers.
Change-Id: I8c0e63df493e1e3e65be0a392841fbb11ff163b9
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Sometimes one would get an error "hdiutil: resize request is above
maximum size allowed." which might have to do with autostretch limits.
Passing the -stretch argument with a sufficiently large size should
make resizing succeed.
Change-Id: I3103ce38e809c2429bed6847ead03f28bfa1f54a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
| |
The used method is similar to what is done for Qt5
Task-number: QTCREATORBUG-8651
Change-Id: I6ac58b4410c03d3f650df04f4fb5425dcfe5e03b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-8830
Change-Id: I3d2d917fc58dc3f62277ac4072b7dc2894fb7cd4
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
| |
We cannot know which module translation files might be needed, so simply
copy all .qm files in Qt's translation directory.
Task-number: QTCREATORBUG-8448
Change-Id: If359f1af67d093c3eeb42855877622b3416a3f41
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: I4180bdc173235497f40da2df1ecd5b20048745e5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
| |
Change-Id: If359d56bf325d24a4e127c385a3925a5e8ee6701
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-8256
Change-Id: I9b03debf9c4c918968fcdfd49078218b54a3b09f
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Qt5 splits the translations into modules as well. The deployqt
script was only copying specific translation patters from Qt,
now we just copy all .qm files from Qt to Qt Creator.
Change-Id: I02302e3f8f6b4673979559ce6cd2a32271b554a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-8297
Change-Id: Ie19534c669a1160a0acce8a037016b1f3007cb6b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
| |
Override any QtLibraryInfo settings.
Change-Id: Ib931d132975769a2ab90f832b672bc6740138841
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-8244
Change-Id: I39bd64bb7a3e75b54f3f0b9297a27b460b603cc9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I4f0864a78d8fc861a716bd8e8734ab0fd4181cc1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-7926
Change-Id: I546dc1e899b6efbce3742046f1b5cc83a9c69612
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
|
| |
Windows has a problem with "install" in the name. Use .bin on Linux like
before.
Change-Id: I4f887a8c0442cd9f0a17425f68a36a371ae9f6b7
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-7991
Change-Id: I4874527fc07040dea803bf50e1e4c335d9eb6810
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I24ce89117812a7f15913dc092687910a39da9358
Reviewed-by: hjk <qthjk@ovi.com>
|