Permalink
Switch branches/tags
Nothing to show
Commits on Sep 8, 2015
  1. dist: Clean and improve Linux and OSX Packager scripts

    jfcabral authored and Smarre committed Sep 8, 2015
    * Make all packager more uniform between platforms
    * Remove qtjambi-util.jar
    * Add qtjambi-src.jar
    
    Change-Id: Iab5b0bf2720c810658006619fafaa21be7975f8c
    Reviewed-on: http://gerrit.smar.fi/1303
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  2. dist/win: Creation of packager and juic scripts

    jfcabral authored and Smarre committed Sep 8, 2015
    Change-Id: I174860baf7f641f112944b56d4c11c2ddd067416
    Reviewed-on: http://gerrit.smar.fi/1302
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  3. InitializeBuildTask: whitespace fix

    Smarre committed Sep 8, 2015
    Change-Id: I16efc85893a87a945bb3c061dc3a3b326c152f98
    Reviewed-on: http://gerrit.smar.fi/1301
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  4. Basic cross compiling support for GCC

    Smarre committed Jun 2, 2015
    Change-Id: I3d2c5a1248b14921b9c33688107a99f21dee44c8
    Reviewed-on: http://gerrit.smar.fi/1279
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  5. Add support for compiling with MSVC 2013

    jfcabral authored and Smarre committed Sep 8, 2015
    Change-Id: If65dfd32f1a703a7bc0ef0caba5b4187a1ee9995
    Reviewed-on: http://gerrit.smar.fi/1298
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  6. javawriteinitialization.cpp: whitespaces

    Smarre committed Sep 8, 2015
    Change-Id: I52e106e8ed4dc9a589734d3e91cc087f4eca9974
    Reviewed-on: http://gerrit.smar.fi/1297
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  7. Add support for themeIcons to the juiCompiler

    seijikun authored and Smarre committed Aug 5, 2015
    Change-Id: I46cd15d9e17c5ac1444fa85fe0188b042259a87d
    Reviewed-on: http://gerrit.smar.fi/1296
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on Jun 20, 2015
  1. dist/linux: Improve scripts for examples, designer and packaging

    jfcabral authored and Smarre committed Jun 13, 2015
    * Qt Designer Integration should now work. The fix is similar to the Mac
    OS version;
    * Examples should now work and display thir source;
    * Packager was improved to support these changes.
    
    Change-Id: I0eb0a25770616c9001d68178014fd7882c1daca8
    Reviewed-on: http://gerrit.smar.fi/1287
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  2. README.md: minor improvements:

    jfcabral authored and Smarre committed Jun 13, 2015
    * Link to INSTALL.md was broken
    * Added link to Jambi's wiki Compile Guides
    * Minor spellcheck
    
    Change-Id: I5506849842a4917eb9fe55913c36636695fb2a69
    Reviewed-on: http://gerrit.smar.fi/1284
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  3. PlatformJarTask: Disable libpng bundling for now

    jfcabral authored and Smarre committed Jun 11, 2015
    This will allow repository builds like lauchpad to compile successfully.
    Fixes bug #313 http://redmine.smar.fi/issues/313 that was preventing 
    successful builds in Ubuntu based distros.
    
    Regarding libpng bundling, it is not required for repository builds, and 
    as far as the website releases are concerned, we can just compile Qt 
    with -qt-libpng flag to bundle it.
    
    Change-Id: I508f581a28e00efe3b525b626f795f5b25b3675e
    Reviewed-on: http://gerrit.smar.fi/1283
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on May 9, 2015
  1. [Ant] - Make sure that qtjambi.macosx.macsdk is only setted in MacOSX

    jfcabral authored and Smarre committed Jan 23, 2015
    Warning: This can potentially break MacOSX compilation if
    for some reason the OS is not correctly detected. Unfortunately
    I can't test it since I don't own a Mac.
    
    Change-Id: Ie3fccef9ce7a331985f6cf067497762100b295cd
    Reviewed-on: http://gerrit.smar.fi/1224
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on Apr 27, 2015
  1. README.md: updated information about Gerrit usage

    Smarre committed Apr 15, 2015
    Change-Id: I184e037bc483bd2785467c83f82dd4d23ff55871
    Reviewed-on: http://gerrit.smar.fi/1274
    Reviewed-by: João Almeida <joao267@gmail.com>
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on Apr 25, 2015
  1. Add a Windows Installer nsi script for MSVC compiler

    jfcabral authored and Smarre committed Jan 22, 2015
    Based on the existing installer for MinGW
    
    Should partially solve task 314 - http://redmine.smar.fi/issues/314
    
    Change-Id: I438573d44ee4b27e0e5712a8992582e1c581d412
    Reviewed-on: http://gerrit.smar.fi/1222
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  2. Attempt to improve Windows batch files for running Qt Designer and Ex…

    jfcabral authored and Smarre committed Jan 20, 2015
    …amples
    
    Partially fixes bug 314 http://redmine.smar.fi/issues/314
    Improvements:
    * The Native libs will now be on the lib folder so the native jar won't be consistently decompressed into a temporary folder. More or less like it is done in Mac OSX;
    * Qt Designer Jambi Plugins will now be inserted in the right place so Qt Designer works properly.
    
    Change-Id: I8233598de466457d417c37b29f6d014e37f29c00
    Reviewed-on: http://gerrit.smar.fi/1221
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  3. Disable libpng bundle for MSVC and MingW compilers (windows)

    jfcabral authored and Smarre committed Jan 19, 2015
    This partially fixes bug 313 http://redmine.smar.fi/issues/313 enabling Jambi to be built on Windows again.
    
    Change-Id: I4f9dc155f3de94bf5d69c11fb14e56affe367316
    Reviewed-on: http://gerrit.smar.fi/1220
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on Apr 14, 2015
  1. Added README.md.

    Smarre committed Apr 14, 2015
    Change-Id: I05bd07245caa285088806d2876cd6401c277147b
    Reviewed-on: http://gerrit.smar.fi/1273
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on Jan 12, 2015
  1. Renamed building doc to INSTALL.md and updated it to reflect current …

    Smarre committed Jan 12, 2015
    …status
    
    Change-Id: Iad180ed403b231032c60f3f60b37f9e726cd2435
    Reviewed-on: http://gerrit.smar.fi/401
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  2. IntelliJ idea project file change

    Smarre committed Jan 12, 2015
    Change-Id: I84c90031b426057f8401b990bd6531a8656395d6
    Reviewed-on: http://gerrit.smar.fi/400
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  3. PlatformJarTask: always bundle libpng

    Smarre committed May 3, 2014
    Usually libpng is not linked statically to Qt, atleast on Linux, so
    now it’s getting bundled automatically.
    
    Change-Id: Ibf461aa0a2c6196109cb162bb41390249b528cde
    Reviewed-on: http://gerrit.smar.fi/335
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  4. Intellij IDEA project files

    Smarre committed Jan 1, 2015
    Change-Id: Ia20b6d8b87f1b33041ea0ec92de8481e720792ca
    Reviewed-on: http://gerrit.smar.fi/377
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  5. Query qmake for default paths if nothing specified in config

    Smarre committed Jan 1, 2015
    Change-Id: I3e8e09856563878717e0cbba4a864cc24b22af1b
    Reviewed-on: http://gerrit.smar.fi/376
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  6. Default to release build

    Smarre committed Jan 1, 2015
    Change-Id: Ibb98cd815deb0aa5f02bce325dabd8c0e0f1b579
    Reviewed-on: http://gerrit.smar.fi/375
    Reviewed-by: João Francisco Almeida <joao267@gmail.com>
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  7. Clarify a comment done in the typesystem in a previous bugfix

    jfcabral authored and Smarre committed Jan 8, 2015
    The fix is required not only for the compilation in the Ubuntu family, but also with Arch and Suse.
    
    This matter has been discussed in
    http://redmine.smar.fi/issues/289
    and
    http://redmine.smar.fi/issues/299
    A special thanks to Phil Schaf for his feedback and help with dealing with this issue.
    
    Change-Id: I5b5d6eb7a2bbe0ac96f08cf1570be16810056fe9
    Reviewed-on: http://gerrit.smar.fi/399
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on Nov 15, 2014
  1. Creation of juic.sh allowing juic to access QtJambi libs in OSX

    jfcabral authored and Smarre committed Nov 15, 2014
    Change-Id: I7b746efa75fa296271925aaccfea3bfdfa1e95c6
    Reviewed-on: http://gerrit.smar.fi/357
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  2. Improve OSX packaging by cutting off duplicated libs.

    jfcabral authored and Smarre committed Nov 10, 2014
    Now the script installer-osx.sh will extract the lib and plugins folders from the native jar,
    installing them in the Mac OS Library folder.
    The designer.sh script was updated to reflect these changes,
    and will call the installer if it doesn't detect the Qt Jambi libs installation.
    
    Change-Id: I78f9d01ea4c9b9cc76bf26777ff6b1e418a7f192
    Reviewed-on: http://gerrit.smar.fi/356
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on Oct 31, 2014
  1. Fix packager-osx.sh

    jfcabral authored and Smarre committed Oct 26, 2014
    It should now properly package the jambi jars, libs, qt designer plugins, and the sources of the examples.
    Validates if QTDIR is set.
    
    Change-Id: Iaf37aa87cf43aca29a691a929c259340e35f9c77
    Reviewed-on: http://gerrit.smar.fi/352
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
Commits on Oct 30, 2014
  1. ant: Move environment variable declaration from setenv to build.xml

    Smarre committed Oct 30, 2014
    Change-Id: I261f0156add1b3d36ab0f55cbfc95ca3cdb50265
    Reviewed-on: http://gerrit.smar.fi/355
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  2. Attempt to fix several bugs regarding the compilation of Jambi under OSX

    jfcabral authored and Smarre committed Oct 26, 2014
    Special thanks to:
    * António Garruço for lending me a Mac and poiting me to the right direction
    * Tiziano Lattisi for his guides on how to build Jambi on Mac OSX
    * Filip Jonckers for his building notes regarding many issues that affect the Mac OSX Jambi build (https://www.mail-archive.com/qt-jambi-interest@qt.nokia.com/msg00509.html)
    * Samu Voutilainen for his support on Jambi related stuff
    
    Change-Id: I61199523b63857e6b772ec6db6825042cf16e349
    Reviewed-on: http://gerrit.smar.fi/354
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  3. juic: allow Qt/C++ signals, by converting them to Java style

    Smarre committed Sep 17, 2014
    Change-Id: Icc91a738383b5d848206e57a1676bb8822f8df4d
    Reviewed-on: http://gerrit.smar.fi/350
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  4. juic: space cleanup

    Smarre committed Sep 17, 2014
    Change-Id: Ia1699db7cb30bf1ceda42cf0d136dc2b40133d1e
    Reviewed-on: http://gerrit.smar.fi/349
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  5. juic: remove uic/cpp

    Smarre committed Sep 17, 2014
    This was leftover from UIC sync from Qt. As we don’t use it,
    there is little reason to keep it for us.
    
    Change-Id: I3dd89ff0728fda8d9cab44a39c26fdc35985c2a9
    Reviewed-on: http://gerrit.smar.fi/348
    Reviewed-by: João Francisco Almeida <joao267@gmail.com>
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  6. InitializeBuildTask: default to minimal include path

    Smarre committed May 2, 2014
    This allows building using minimal generator include path,
    to allow building without unnecessarily just commenting out similar
    line in build.properties.
    
    Change-Id: Ieba3216f3f052f1f667a8bc546be10651513c335
    Reviewed-on: http://gerrit.smar.fi/334
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  7. Ignore Intellij Idea project files

    Smarre committed May 4, 2014
    Change-Id: If7442278e955536db05113771a613611da73468b
    Reviewed-on: http://gerrit.smar.fi/336
    Reviewed-by: João Francisco Almeida <joao267@gmail.com>
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  8. typesystem: move QAccessible enums to their designated place

    Smarre committed May 6, 2014
    Change-Id: I87faa1cc668a3fadafa8e7b079af876cc0127f76
    Reviewed-on: http://gerrit.smar.fi/342
    Reviewed-by: Samu Voutilainen <smar@smar.fi>
  9. QtDynamicMetaObject: remove debug fprintf

    Smarre committed May 14, 2014
    Change-Id: I83664a76de85f9fc6c1e5cf1db7e8c636fd1f859
    Reviewed-on: http://gerrit.smar.fi/345
    Reviewed-by: Samu Voutilainen <smar@smar.fi>