aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix for some typos in the QAndroidJniObject documentation.old/5.2Christian Strømme2014-01-271-2/+2
| | | | | | | | qualified was misspelled "qulified". Change-Id: Ie38ec999f0c3b7146cc52c9a28c2a82d5d007355 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated the qdocconf to include .java filesVenu2013-12-131-0/+1
| | | | | | | | | | | | | | | | QDoc ignores the .java files without the following entry in the qdocconf: examples.fileextensions += *.java Java files are not part of the default set of file types included by Qdoc. So there must be an entry in the qdocconf to force Qdoc to include additional file types such as the .java files. Task-number: QTBUG-35568 Change-Id: Ic8b805e0dec937fb0e8b19f0b94883ced5eb6c04 Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix non-compiling doc snippets.Alex Blasche2013-12-132-9/+9
| | | | | Change-Id: I0e5160f18f89ed25882741d93410ea1860ed659a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove stray curly bracket in QAndroidJniObject's documentation.Christian Strømme2013-12-131-1/+1
| | | | | | | The bracket was misplaced in a very unfortunate place. Change-Id: Id2f0f96cc49689cb6c656757ddae6690ff1da0d2 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Add examplesinstallpath in qdocconfv5.2.0-rc1v5.2.0Christian Strømme2013-11-211-0/+3
| | | | | | | | If we don't add examplesinstallpath the examples won't be shown in Qt Creator's welcome page. Change-Id: Ia1c0015262e4dd3c6de83d7d73231e3e3e0cf027 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix note about jni references in documentation.Christian Strømme2013-11-071-2/+2
| | | | | | | | QAndroidJniObject does not manage user created references regardless of them being local or global refs. Change-Id: I4afa8aba8d53f35d83d36758946d4b0f0cb5734a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix bug in code snippet.Christian Strømme2013-11-071-2/+3
| | | | | | | | We should set a good example by deleting local refs. as soon as we are done with, also in our own examples... Change-Id: Ib9b25b226d79532c137e1c404625840ffd3cdf6e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: If3b2ef1bec1805e5f6bf14c8468126e4160e0ed0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Update documentationChristian Strømme2013-10-297-53/+281
| | | | | | | | | | - The list of examples was not showing in the index page. - Added information about types, method signatures, J2N and GC. - Fixed some typos. Change-Id: Ibe66ddbc0b1cac323563d629ca82bfe54d69dfc1 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Rename QJNIXxx classes to QAndroidJniXxx.Christian Strømme2013-10-107-390/+390
| | | | | | | | | The old classes where not following the usual convention for acronyms in class names. Change-Id: I2fad72483c51ca95a2703d914d6a678c5f7cde98 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Adding "qtdoc" to the depends qdocconf variable.Jerome Pasion2013-10-081-1/+3
| | | | | | | | Needed in order to link to the main Qt 5.2 documentation. Change-Id: I451f4d60f165befe179cfe58904876c42211cfee Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Enable running 'make docs' on non-android platformsTopi Reinio2013-09-261-2/+7
| | | | | Change-Id: I26389a48912475598946cdfa839d09432a6c364a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix infinite recursion in QJNIObject::getStaticField<jfloat>()Eskil Abrahamsen Blomfeldt2013-09-231-2/+2
| | | | | Change-Id: I4e22a43bb689f46c5fb294da9d55671a28cab4cf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Improve documentation.Christian Strømme2013-09-237-71/+191
| | | | | Change-Id: Ia3999f853aa9b0ca1678f322419ddd200cae4b1a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add example of JNI APIEskil Abrahamsen Blomfeldt2013-09-232-1/+1
| | | | | | | | This example adds a custom class to the project and calls into it with JNI to set a notification message in the status area. Change-Id: I74d7a87c0511b98608422788c1c282e9af57c074 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Add guard to disable other platforms then AndroidChristian Strømme2013-09-231-1/+1
| | | | | Change-Id: If3efdd6e24dfc12b0baade98fd8d7538c5ff94b6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add Qt JNI API.Christian Strømme2013-09-2013-0/+2708
The QJNI API's provide an easy way to communicate with Java API's from C++. The API consists of two classes, QJNIObject which acts as a wrapper around Java classes and QJNIEnvironment which attaches the current thread to the Java VM and exposes the Java Native Interface. Change-Id: I9cdc395249de74f940b75eab9f2bd32347d5d432 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>