Commit Graph

2277 Commits

Author SHA1 Message Date
Tobias Nätterlund
e80c4b80fc QNX: Fix QML_IMPORT_PATH setting in shipped bar-descriptor.xml files
Include the path to /usr/lib/qt4/imports, to allow e.g. QtMultimediaKit
to be found, as it's installed there

Change-Id: I99815e82b8b25973d4347a0e95e1ecf7402b5d7b
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-01-21 08:10:41 +01:00
Kai Koehne
3306fda0e8 Add qmlscene to external tools menu
Task-number: QTCREATORBUG-7797
Change-Id: Icddb58db27f871c82468bf3a77bedc152ddf29cc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2012-12-17 14:53:53 +01:00
Kai Koehne
a57895c6a5 QtQuick2 wizard: Remove android special case
The current logic was broken (tried to search the qml files in the
root directory). Anyhow, there's no Android port of Qt 5 yet, so
let's keep it out for now.

Change-Id: Id854a6af00a15e424a79f903ea1d9272a89a66fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-14 17:17:32 +01:00
Thomas Hartmann
27742b6fc8 WelcomePage: updating video tutorials
I removed the Qt SDK 1.1 and some other outdated videos.
I added new videos from Qt Developer Days 2011/2012.
I also had to add icons new for Developer Days 2011/2012.

Removed videos:
Qt Creator! Getting the most...
Qt Quick Components
SDK 1.1 videos

New videos:
2012
What's New in QtWebKit in 5.0
Creator 101
Qt 5 Roadmap
QML Coding, Performance and Debugging: Usage of Tools

2011
Qt and Qt Quick
Qt Quick Best Practices and Design Patterns
What’s new in QtQuick 2.0


Task-number: QTCREATORBUG-8432
Change-Id: I5cf2a981d156a6825cda97e9bc7729b73c7350da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-12-14 15:05:02 +01:00
Thomas Hartmann
71a0daa11c Welcomepage: Do not limit the vertical size of the example browser
I kept the limitation to 3024 pixels to keep the patch small
and avoid accidents/regressions.

Task-number: QTCREATORBUG-8411
Change-Id: I1e2fc453500358d67bdb62732adcdc8e7fa17e1b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-12 11:35:27 +01:00
Kai Koehne
c6e47403c4 Fix chinese translation file
Got broken in cb18283dd8.

Change-Id: I402f2efa711b6dc42d5d6363b07a98560c942e33
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-30 15:43:01 +01:00
Jing Bai
cb18283dd8 update the Simplified Chinese translation file
Change-Id: I39b8284f77eb0420e63e752d7dd8881d24133d09
Reviewed-by: Liang Qi <liang.qi@digia.com>
2012-11-30 11:44:11 +01:00
Marcel Krems
297afe3b01 Copy plugins to correct user directory under Unix.
Change-Id: I587154926a5e4bce62984445d7a00547c0b51673
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 10:45:58 +01:00
Sergey Belyashov
5b1bee4d5d Updated Russian translation
Change-Id: I41db815a7759b75b08c0bc04b948973f6bc24df3
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-27 19:14:15 +01:00
Kai Koehne
62b20005dd Split up QML Extension wizard in Qt Quick 1 and Qt Quick 2 one
Task-number: QTCREATORBUG-8269
Change-Id: I6b4a4d54499302354606f9446f68b9088daad1e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-11-26 14:15:12 +01:00
Kai Koehne
536bea2d9e QmlExtensionPlugin: Fix compilation with QtQuick1/Qt 5
Change-Id: Ib3899f8097c97114baeca0fe7c9b6ac4ba78dbde
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-11-26 14:14:35 +01:00
Christian A. Reiter
c09f2249bb fix German double mapped key accelerator for menus "Datei", "Debuggen"
Change-Id: I249d730661279346de5c3654cdcfe335d5ead15e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-19 20:08:13 +01:00
hjk
72c2a73bcb debugger: handle gdb.TYPE_CODE_FUNC as "generic" type
This seems not to have been used in the past.

Change-Id: I6e6ce80b8cdd1f20477cde2718e5283a886bb87a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-16 10:20:16 +01:00
Liang Qi
0f7039251f Add zh_TW into LANGUAGES in translations.pro
Change-Id: I46ad31d8e1a1161edbd443424be61d288f6f7ccb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-13 20:20:49 +01:00
Przemyslaw Gorszkowski
54882fcf54 Update Polish translations
Change-Id: Ia8fcaf526c2f57f86074299cfadf5a3c4c0f00c1
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2012-10-30 12:01:30 +01:00
Topi Reinio
db9cc97d06 Application templates: remove Symbian remnants from deployment.pri
Removes TARGET.EPOCHEAPSIZE and TARGET.CAPABILITY definitions (both are
specific to Symbian platform and now obsolete).

Change-Id: I5d1f00717c5284945551cc2472af67e0d80b736a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-26 17:27:58 +02:00
Topi Reinio
2982545dbd QmlApplicationViewer: properly resolve install paths
This change makes QmlApplicationViewer applications find their qml
resources also in non-installed builds, regardless of the current
working directory.

On non-unix platforms applicationDirPath() is not used at all, and on
unix, it's used only for searching applicationDirPath/../path, which
is valid only after install. In-source or shadow-built apps find
their qml resources only if working directory == application
(executable) directory.

Path may refer to subdirectory in application directory. On windows,
non-installed application binary can also reside in /Release or
/Debug, so its resources need to be searched under parent directory
as well.

Change-Id: I81f602406787c20830c656fd5dffd11aa9b4afba
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-26 10:37:57 +02:00
Sergey Belyashov
4f0ca81770 Russian translation update
Change-Id: Id68bcd0c83842cb72503f2d8335df1b3a76b068c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2012-10-23 17:07:41 +02:00
jkobus
78b4b8ae6e Update Polish translations
Change-Id: I88ce5cc11761ec44305f569a61d4aea8c91f1c5e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2012-10-23 07:33:24 +02:00
Franklin Weng
565c695b32 Add Traditional Chinese translation
It's a clean version without all obsolete items.

Done-with: Juei-ray Tseng <e222et@gmail.com>

Change-Id: I609f8d6df15f75fa2728c90dab8b8f6d6c7db154
Reviewed-by: Liang Qi <liang.qi@digia.com>
2012-10-22 10:58:36 +02:00
mfekari
8b29f4439a Qnx: Update the wizard templates for Qt5 applications on BlackBerry
Change-Id: I4b17c59b1e25fd453d2fe09fb865832291ffc87c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-19 11:15:43 +02:00
Friedemann Kleint
2f3730ca47 Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming.
QtQuick1 is now (again) called QtDeclarative.

Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
2012-10-18 11:47:47 +02:00
Kevin Krammer
2910233e52 QNX: use QmlApplicationViewer provided by main QtQuick template
Reuse the QML application class provided by the standard QtQuick1
template.

Extends qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp with
code paths for Q_OS_QNX

Change-Id: I04a283078299f662d630d9387cedc65100f545a0
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-10-15 21:07:01 +02:00
axasia
62b400cde7 Update japanese translation for 2.6.
Change-Id: I673579a0224df955b041c7a93a5c53e3ef0e7760
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-10-15 18:43:36 +02:00
Robert Loehning
3a097c295c Fixed German translation
Change-Id: Iba3ed9ee222ba5cc886814814df5daf155f24d69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-10-09 17:44:19 +02:00
Kevin Krammer
af4b4e9008 QNX: remove unnecessary lines from project template files
the "-platform blackberry" command line argument is no longer
required in bar-descriptor.xml files due to Qt being built with
QT_QPA_DEFAULT_PLATFORM_NAME defined "blackberry", thus making that
the QPA loader's default choice.

See mkspecs/blackberry-armv7le-qcc/qplatformdefs.h and
mkspecs/blackberry-x86-qcc/qplatformdefs.h

Change-Id: I35fdaf71adf0bb1b9041da90db857a7074b12cff
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2012-10-09 16:40:12 +02:00
Eike Ziller
2b56943a8e Change the default plugin provider to QtProject.
Change-Id: I4fbfeb3668d6688e4947cda514c1a56f7d01ca52
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:39:40 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:10:50 +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
Friedemann Kleint
0fc9e7c877 Fix ambiguous shortcuts in the Git submit editor.
Task-number: QTCREATORBUG-7965
Change-Id: I4f1988a1f3bac7afe1d7195a74bdb874b1041344
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian A. Reiter <christian.a.reiter@gmail.com>
2012-10-05 15:54:50 +02:00
Eike Ziller
62422de5d0 Remove feedback link.
The form has vanished and wasn't up to date anymore anyhow.

Change-Id: I40292593e8e705da0b5e47f54ab6c1a519144404
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-05 14:19:27 +02:00
hjk
ecf8b82cdc debugger: fix QMap dumper/gdb pretty printer for Qt 5
Change-Id: If1b2dcb6d517b837a135fbdb97cde422122464c3
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-05 11:23:46 +02:00
hjk
4265d47c78 debugger: fix display of QObject object names for Qt 5
Change-Id: I58ad709575f4846812de3e2109112be170e8e433
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-05 11:23:20 +02:00
Tobias Nätterlund
26ef19061c QNX: Fixup bar-descriptor.xml files
- Qt 4 is included on the device for the BB10, add its path to LD_LIBRARY_PATH and QT_PLUGIN_PATH
- Make application ID depend on project name

Change-Id: I2dc67c0415395cb0a2c64fec1f1c43a96a3dde2c
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 09:55:06 +02:00
hjk
4c51cbce0a debugger: use a more robust method to detect function pointers
The previous one was failing on 'this' pointers of instances of
classes templatized on function pointers.

Change-Id: I2be50db5be643974f318fb6999136f5c7a4cfc1c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2012-10-04 10:29:49 +02:00
Friedemann Kleint
8dc234c171 German translation for 2.6.
Change-Id: I8cbb07c76c730cf40d6099b3cd26ebc82923931c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-10-02 12:38:17 +02:00
Thomas Hartmann
d246abe677 QmlDesigner: use import QtQuick 1.0 and not Qt 4.7
Qt5 warns about import Qt 4.7

Change-Id: I1561f957637945d4bc61fb90abd8d0a60599133f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-27 11:19:39 +02:00
Thomas Hartmann
7da5ba30ec QmlDesigner: remove hard webkit dependency in qmlpuppet and Qt 5
Change-Id: Ie198a0e3d8342fb62ff51ec2475134cdf4f9dcea
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit ad535b5b62)
2012-09-27 09:50:39 +02:00
Thomas Hartmann
7b5d701f31 QmlDesigner: compile fix qmlpuppet with Qt 5
This patch allows compiling the qml(1)puppet with Qt 5.
Some minor fixes for private headers, cleaning up some old code
and QUrl::UrlFormattingOption got renamed.

Change-Id: I732f9f9ef0b831d09134b1d2c013efda55e36e11
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit fee6b56a7c)
2012-09-27 09:50:22 +02:00
Thomas Hartmann
4fe44819e6 QmlDesigner: fix for qmlpuppet and Qt 5
Change-Id: Ie199a0e3d8342fb62ff51ec2475134cdf4f9dcee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 362b8d989d)
2012-09-27 09:49:54 +02:00
Marco Bubke
1bd4795524 QmlDesigner.NodeInstances: Fix type registration
Change-Id: I571812c88b323e339f5b4c068f8027d9217da64c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 9e7a8e4118)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:45 +02:00
Thomas Hartmann
ac186ff7ae QmlDesigner: final compile fixes for 2.6 on Qt 5
Change-Id: Iba13f1b03a641f913d69822ddd623d6bfe38825f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:41 +02:00
Thomas Hartmann
1bfd2a0c1f QmlDesigner.qmlPuppet: set QDataStream version
We already did some refactoring on this part in master.

Change-Id: Ia878afa3aa773d2496343e052ababf30da9351d7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:37 +02:00
Marco Bubke
da7c6fb8a3 QmlDesigner.Instances: Fix type registration
Change-Id: I85378c0a2884a7c8886482f38bad24210ef33d69
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit d8d862f261)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-09-27 09:49:32 +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
Orgad Shaneh
db0a6f525b qbs files: Generate translations
Change-Id: Ia8e486e377a0858974fd6503f85762bb34039786
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-24 18:02:02 +02:00
Eike Ziller
804ae90c80 Mac: Fix Qt5 debug helper compilation.
Task-number: QTCREATORBUG-7917

Change-Id: I6e76923e02c9c1ccc411d2f0978fe63e867e6469
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-24 12:01:03 +02:00
Sergio Ahumada
9c2afc4f29 doc: Fix some spelling errors
Change-Id: I22c0de2d1c5277879fe504764c15a76d1d7f198b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-09-21 16:26:19 +02:00
Friedemann Kleint
0983e67fd1 Update German translation after Kit renaming for 2.6 Beta.
Change-Id: Ib6bd46e66eb0d44a9e710f884537d6b85b23f1b9
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-11 11:38:35 +02:00
hjk
d34f44f460 debugger: fix display of signed data in arrays
This was a regression introduced with the block dumping for arrays.

Change-Id: I9684fafeb27a9268a2558557f76d1092136975a4
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-11 00:33:46 +02:00