feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,236 Commits 108 Branches 368 Tags
42c16ff7d3a598ad77824871fe5d47847da9995d
Commit Graph

81 Commits

Author SHA1 Message Date
Eike Ziller
3b112a0fa7 Mac: deploy all Qt translation files. 
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>
 2012-12-17 17:18:37 +01:00
Eike Ziller
5a51b8ffc4 Windows: Fix deploy script. 
Change-Id: I4180bdc173235497f40da2df1ecd5b20048745e5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-12-11 10:13:57 +01:00
Eike Ziller
96b70ac611 Fix deployment of Qt libs (debug vs release) on windows. 
Change-Id: If359d56bf325d24a4e127c385a3925a5e8ee6701
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-12-10 13:53:20 +01:00
Eike Ziller
89dc3eebd0 Fix deployment of designer plugins. 
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>
 2012-12-10 13:53:02 +01:00
Eike Ziller
d0e055a1f2 Fix copying translations from Qt. 
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>
 2012-12-06 12:28:50 +01:00
Eike Ziller
0d5593e8ce Deploy Qt 5 printsupport plugins on Lin/Win 
Task-number: QTCREATORBUG-8297
Change-Id: Ie19534c669a1160a0acce8a037016b1f3007cb6b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2012-11-30 10:45:28 +01:00
Kai Koehne
fa63059cbd Deployqt: Add qt.conf 
Override any QtLibraryInfo settings.

Change-Id: Ib931d132975769a2ab90f832b672bc6740138841
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-11-28 15:42:15 +01:00
Eike Ziller
8665421a3b Deploy Qt translations on Mac. 
Task-number: QTCREATORBUG-8244

Change-Id: I39bd64bb7a3e75b54f3f0b9297a27b460b603cc9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2012-11-28 09:47:03 +01:00
tjenssen
a9da84dc63 adjust deployqt to deploy also a qt5 
Change-Id: I4f0864a78d8fc861a716bd8e8734ab0fd4181cc1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-22 11:41:00 +02:00
Eike Ziller
144fef6b69 Mac: use the deployed Qt for sdktool 
Task-number: QTCREATORBUG-7926

Change-Id: I546dc1e899b6efbce3742046f1b5cc83a9c69612
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-10-19 11:16:09 +02:00
Eike Ziller
69f8e48de4 Rename the (un)installers. 
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>
 2012-10-16 14:04:05 +02:00
Eike Ziller
f3d30dfba1 Fix installation directory and add version to title. 
Task-number: QTCREATORBUG-7991

Change-Id: I4874527fc07040dea803bf50e1e4c335d9eb6810
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-10-10 09:11:47 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Tobias Hunger
dd6517a976 hasCopyright: Creator does not use GPL license 
Change-Id: I24ce89117812a7f15913dc092687910a39da9358
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-05 15:21:03 +02:00
Tobias Hunger
ffb90dff22 Update copyright check script 
Use perl instead of bash and avoid lots of rereading of the file,
making the script much faster to run.

Change-Id: Ic898f324b2952c593b89d8efca8ea1e344cf5858
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-05 11:49:06 +02:00
Eike Ziller
154f6c859e Add installer target. 
Requires Qt Installer Framwork (IFW)

Change-Id: Id78c05f86cc104d29d4ed3ba02baefa20d49fe4f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2012-09-28 09:35:08 +02:00
Daniel Molkentin
745cb4b7ec Introduce $$QTC_PREFIX 
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2012-09-25 10:14:51 +02:00
Friedemann Kleint
d77b27c556 test2task.pl: Mark XPASS as an error as well. 
Change-Id: I1e757c77249d25edccb8a8688ccc259383cb210e
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-26 23:05:48 +02:00
Eike Ziller
fd5b22062c no qmlprofiler tool anymore, don't try to deploy Qt for it 
Change-Id: I2e8711cba614fd64d4af0dced0b844cfda6b55c4
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-05-22 10:11:19 +02:00
Tobias Hunger
56908de4d5 Make mytasks script take a origin to diff against 
Change-Id: I8640b0852e96b21518fde36d0e0eb24ae473b6f9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-24 10:16:09 +02:00
Tobias Hunger
d804503009 Fix executable bit of scripts/mytasks 
Change-Id: I4db30800eb0c15f4b7a10ff93a3baf27f6a2110d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-04-20 12:45:47 +02:00
Tobias Hunger
8c0316955f Update mytasks to new coding style 
Fix some false positives while at it.

Change-Id: I253a2931f866ba192cbc398b784ef851f35ccfb1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-04-17 10:56:59 +02:00
Tobias Hunger
c46221ee9a Fix git branch retrieval in mytasks.pl script 
Change-Id: I86ddcff32e697d7bf02217a05e9f5a4e13cc1015
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-04-16 18:09:58 +02:00
Daniel Molkentin
23e0d86f04 deployqt: copy Qt libs from bin/, not lib/ on Windows. 
Change-Id: I967dbfa89dd192ef47ee14dd15ed702c66f263c5
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-03-14 17:41:32 +01:00
Daniel Molkentin
272d590090 deployqt: Proposed for for Windows deployment, some cleanups. 
Change-Id: I16583d70371e69bf6729a4b028a7dbf49b3b02df
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-03-13 14:02:54 +01:00
Robert Loehning
453fa17432 Improved sample usage in hasCopyright.sh 
Change-Id: Iae3ef128e62faba579ce7385bedc90a4e4600019
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 09:50:41 +01:00
Tobias Hunger
4517ef6238 Update copyright check script 
Update copyright check script for the new (old) email address

Change-Id: Ib3dbb3505362e57587832467d9a0323b8cde6272
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-02 16:28:25 +01:00
Daniel Molkentin
3fe2113a2b Fixes for bindist target. 
Change-Id: Iab025ed796e807aab0315a583a04ed8865fc0d44
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-01-30 15:15:43 +01:00
Eike Ziller
2f021edfdd Avoid deployqtHelper_mac message when directory already exists. 
Change-Id: Iff13147fd6541741b94f4bd2f611e05bd87a7885
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-01-30 10:29:04 +01:00
Eike Ziller
d8a3b3a1e9 Mac/deployqt: Give qmlpuppet the correct qt.conf 
Change-Id: I73162205f8ed9978eeaca2a91e331d2e323b15ef
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-01-24 17:21:13 +01:00
Daniel Molkentin
ab079b86cf Add platform names and versions 
Also introduce $INSTALL_EDITION env var which acts as infix.
(possible values: opensource, commercial, etc)

Change-Id: I86f58444b21853ae4bcb8509e491610c76c414da
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-18 15:53:50 +01:00
Daniel Molkentin
ccb0a1bf9e Add make dmg target 
Change-Id: I643d571afbb7b16f860092c885e3574268f91ddf
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-17 09:53:10 +01:00
Daniel Molkentin
b49a817bfb Fixes for checkInstalledFiles script 
- work on windows
- show unified instead of context diff

Change-Id: Id3ce927f9fdc9783ccb927bcac7d921941865023
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-13 10:09:40 +01:00
Daniel Molkentin
6340f5cf37 Fix rpath call (not calling chrpath through shell anymore). 
Change-Id: Ia966c154e0827ce7dc0c4d0a3a45d234f82d0e90
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-01-13 10:09:22 +01:00
Daniel Molkentin
92cc5146d3 Convert unixdeployqt.sh to python script compatible with windows. 
Change-Id: I6dc30b6f9ca2268257ea236a574ee9dea152daa3
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-12 10:27:03 +01:00
Friedemann Kleint
f2964ea503 test2tasks.pl: Handle QML tests as well. 
- Create mapping for .qml-files.
- Fix check for absolute file names (depending on OS).

Change-Id: Ie847c283d2f37adef079b6de99606f2698dfe476
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-05 14:21:05 +01:00
Daniel Molkentin
fd1062be8a Add script that can check builds for completeness. 
It checks against os-dependent lists which will be submitted
in follow-up commits.

Change-Id: Ieb40b19dbd85c30b28062b46320a6ee60ba672af
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-12-27 13:20:48 +01:00
Friedemann Kleint
4c54a05f89 test2tasks.pl: Add useful options for submodule testing. 
Make it possible to use absolute file names or prefix them for
creating Qt 5 testing summary logs.

Change-Id: I3d4a5fa24a9a7652fb4f8087e4b6e2a6ae6fdfe7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-12-22 11:31:25 +01:00
Friedemann Kleint
397069c640 test2task.pl: Report FAIL and FATAL on stderr. 
Change-Id: Iaa6e31f8d76537ccf0e79bf2395b75e22932c304
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-12-20 15:39:44 +01:00
Daniel Molkentin
cfcb7e3101 Add script to allow for self-contained Qt Creator packages. 
Change-Id: I9f85758ca6021990817965826218fbe56363ce04
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-12-12 20:44:48 +01:00
Daniel Molkentin
8961c373e9 Remove obsolete scripts. 
Change-Id: I6593687c933511d3b6578cf9c5c5ea33b5efc890
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-12-12 08:29:12 +01:00
Friedemann Kleint
9408ad93b3 test2tasks.pl: Fix differing output format of testlib on Unix. 
Change-Id: I37fb39fa00e7e4a45ac843eba9f50d2d95a56ae1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-09 11:34:20 +01:00
Friedemann Kleint
038f4b2671 Add test2tasks.pl script for converting test logs to task files. 
Change-Id: Ia3bdd9c620c469ab87dfcb270617c4bc865ed209
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-08 16:36:07 +01:00
Tobias Hunger
d34dd1410e scripts: Fix handling of spaces 
Change-Id: I8972fc656dadee54467cc710ff2f832f729a2ce8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-19 11:31:11 +02:00
Friedemann Kleint
94d034b803 Quote arguments in krazy2tasks, add usage. 
Change-Id: I992c0e72c41d1c82788ef096c7d0b4433b6ce148
Reviewed-on: http://codereview.qt.nokia.com/3726
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-29 13:13:52 +02:00
Oswald Buddenhagen
fa0127bedd Merge remote-tracking branch 'origin/2.2' 
Conflicts:
	src/plugins/debugger/breakhandler.cpp
	src/plugins/debugger/cdb/cdbengine.cpp
 2011-05-16 17:32:23 +02:00
Bill King
d097037d52 Updates to krazy2 reporting. 2011-05-09 09:33:53 +02:00
Tobias Hunger
f8ef0fac13 Fix hasCopyright.sh script to work with latest copyright statement 
Change-Id: I71b41d7837a0901c5d1ab718dc8f93e4122231fa
 2011-05-06 15:16:59 +02:00
con
8714d3ae43 Uploading the doc is now handled differently. 2011-04-29 16:08:53 +02:00
Tobias Hunger
1d3adef24a Script: Update hasCopyright script 
Update hasCopyright script to distinguish between no/wrong
copyright.
 2011-02-21 14:44:54 +01:00