qt-jambi:tebmo-qtjambi.git
7 years agolast commit before merge ant-refactor
Samu Voutilainen [Sun, 28 Nov 2010 03:01:11 +0000 (05:01 +0200)]
last commit before merge

7 years agoMerge branch 'ant-refactor' of gitorious.org:qt-jambi/qtjambi-4_7 into ant-refactor
Samu Voutilainen [Sun, 28 Nov 2010 02:19:04 +0000 (04:19 +0200)]
Merge branch 'ant-refactor' of gitorious.org:qt-jambi/qtjambi-4_7 into ant-refactor

7 years agofew fixes related to kdephonon
Samu Voutilainen [Sun, 28 Nov 2010 02:17:38 +0000 (04:17 +0200)]
few fixes related to kdephonon

7 years agofew fixes related to kdephonon
Samu Voutilainen [Sun, 28 Nov 2010 02:17:38 +0000 (04:17 +0200)]
few fixes related to kdephonon

7 years agoadded kdephonon flag for generator
Samu Voutilainen [Fri, 26 Nov 2010 16:11:21 +0000 (18:11 +0200)]
added kdephonon flag for generator

7 years agoMerge commit 'refs/merge-requests/4' of git://gitorious.org/qt-jambi/qtjambi-4_7...
Samu Voutilainen [Fri, 26 Nov 2010 13:05:34 +0000 (15:05 +0200)]
Merge commit 'refs/merge-requests/4' of git://gitorious.org/qt-jambi/qtjambi-4_7 into ant-refactor

7 years agoreject S60Style from building, it is causing problems on MSVC
Samu Voutilainen [Fri, 26 Nov 2010 12:31:19 +0000 (14:31 +0200)]
reject S60Style from building, it is causing problems on MSVC

7 years agomore fixes
Samu Voutilainen [Thu, 25 Nov 2010 14:58:06 +0000 (16:58 +0200)]
more fixes

7 years agofixing type system a bit more
Samu Voutilainen [Wed, 24 Nov 2010 23:10:11 +0000 (01:10 +0200)]
fixing type system a bit more

7 years agoSplit "make clean" from <delete ...> tasks. Fix path typos release/debug.
Darryl L. Miles [Wed, 24 Nov 2010 21:15:29 +0000 (21:15 +0000)]
Split "make clean" from <delete ...> tasks.  Fix path typos release/debug.

7 years agoFix to make examples build for target jar.qtjambi-examples
Darryl L. Miles [Wed, 24 Nov 2010 20:29:46 +0000 (20:29 +0000)]
Fix to make examples build for target jar.qtjambi-examples

7 years agojogl.jar is needed for ANT target: jar.qtjambi-examples
Darryl L. Miles [Wed, 24 Nov 2010 15:45:39 +0000 (15:45 +0000)]
jogl.jar is needed for ANT target: jar.qtjambi-examples

7 years agodebugging stuff and adding new type
Samu Voutilainen [Wed, 24 Nov 2010 15:00:06 +0000 (17:00 +0200)]
debugging stuff and adding new type

May not be good way, though.

7 years agoMore antfiles/clean.xml changes, fixed generator\{debug,release}\*** cleanup and...
Darryl L. Miles [Wed, 24 Nov 2010 14:53:26 +0000 (14:53 +0000)]
More antfiles/clean.xml changes, fixed generator\{debug,release}\*** cleanup and additional quiet="true"

7 years agoREMOVE: src/java/qtjambi-util/***/*.class
Darryl L. Miles [Wed, 24 Nov 2010 14:40:19 +0000 (14:40 +0000)]
REMOVE: src/java/qtjambi-util/***/*.class

7 years agoAdded ANT distclean target and removal of more generated file.
Darryl L. Miles [Wed, 24 Nov 2010 11:38:10 +0000 (11:38 +0000)]
Added ANT distclean target and removal of more generated file.

7 years agoREMOVE: generator/debug/pp-scanner.o
Darryl L. Miles [Wed, 24 Nov 2010 11:08:35 +0000 (11:08 +0000)]
REMOVE: generator/debug/pp-scanner.o

7 years agoRemove mistakenly committed class files
Samu Voutilainen [Wed, 24 Nov 2010 10:09:23 +0000 (12:09 +0200)]
Remove mistakenly committed class files
Modified build files for proper kdephonon support

7 years agomake initialize task compatible with ant 1.7
Samu Voutilainen [Tue, 23 Nov 2010 17:34:47 +0000 (19:34 +0200)]
make initialize task compatible with ant 1.7

7 years agodocumentation generation fixes
Samu Voutilainen [Tue, 23 Nov 2010 16:47:10 +0000 (18:47 +0200)]
documentation generation fixes

7 years agoremute qgenericmatrix
Samu Voutilainen [Tue, 23 Nov 2010 15:05:10 +0000 (17:05 +0200)]
remute qgenericmatrix

7 years agofix quite a bit errors in generator
Samu Voutilainen [Tue, 23 Nov 2010 14:03:46 +0000 (16:03 +0200)]
fix quite a bit errors in generator

7 years agoadditions in type system
Samu Voutilainen [Mon, 22 Nov 2010 15:03:23 +0000 (17:03 +0200)]
additions in type system

7 years agomissing script...
Samu Voutilainen [Sun, 14 Nov 2010 23:25:28 +0000 (01:25 +0200)]
missing script...

7 years agoWork for brinding documentation back alive
Samu Voutilainen [Sun, 14 Nov 2010 23:15:22 +0000 (01:15 +0200)]
Work for brinding documentation back alive

- Fixed one bug in generator introduced by me
- Reworked doc building script to use ruby and proper parameters
- Copied some files from Qt tree to Jambi tree as one of them needs a
  change and it pulls all those other files...
- Some reformatting for generator files
- Minor work for ant tasks

7 years agoMerge branch 'ant-refactor' of gitorious.org:qt-jambi/qtjambi-4_7 into ant-refactor
Samu Voutilainen [Thu, 28 Oct 2010 15:24:12 +0000 (18:24 +0300)]
Merge branch 'ant-refactor' of gitorious.org:qt-jambi/qtjambi-4_7 into ant-refactor

7 years agofix building of multimedia module
Samu Voutilainen [Wed, 27 Oct 2010 21:59:58 +0000 (00:59 +0300)]
fix building of multimedia module

7 years agoUsing the predefined ProcessBuilder
Akos Kemives [Mon, 25 Oct 2010 10:08:45 +0000 (12:08 +0200)]
Using the predefined ProcessBuilder

7 years agoAdd Exception handling, remove useless code
Akos Kemives [Sun, 24 Oct 2010 12:34:37 +0000 (14:34 +0200)]
Add Exception handling, remove useless code

7 years agoReplace Runtime access with ProcessBuilder
Akos Kemives [Sun, 24 Oct 2010 12:24:09 +0000 (14:24 +0200)]
Replace Runtime access with ProcessBuilder

7 years agoFix library.native.qmake exception on multiple QT_CONFIG parameters
Akos Kemives [Sat, 23 Oct 2010 14:49:52 +0000 (16:49 +0200)]
Fix library.native.qmake exception on multiple QT_CONFIG parameters

7 years agoFix wrong paths in generator/generator.qrc
Akos Kemives [Fri, 22 Oct 2010 20:45:09 +0000 (22:45 +0200)]
Fix wrong paths in generator/generator.qrc

7 years agomore refactor
Samu Voutilainen [Tue, 19 Oct 2010 17:03:59 +0000 (20:03 +0300)]
more refactor

7 years agoMerge gitorious.org:qt-jambi/qtjambi-4_7 into ant-refactor
Samu Voutilainen [Mon, 18 Oct 2010 22:33:22 +0000 (01:33 +0300)]
Merge gitorious.org:qt-jambi/qtjambi-4_7 into ant-refactor

7 years agoMerge commit 'refs/merge-requests/2' of git://gitorious.org/qt-jambi/qtjambi-4_7...
helge [Fri, 15 Oct 2010 20:14:08 +0000 (22:14 +0200)]
Merge commit 'refs/merge-requests/2' of git://gitorious.org/qt-jambi/qtjambi-4_7 into integration

7 years agoUnit Tests for GeneratorUtilities.java
Akos Kemives [Wed, 13 Oct 2010 09:51:29 +0000 (11:51 +0200)]
Unit Tests for GeneratorUtilities.java

7 years agofix dylib dependencies for macosx
Benoit Decherf [Tue, 12 Oct 2010 11:27:08 +0000 (13:27 +0200)]
fix dylib dependencies for macosx

7 years agomoved designer integration to src/cpp
Samu Voutilainen [Sat, 9 Oct 2010 13:44:07 +0000 (16:44 +0300)]
moved designer integration to src/cpp

7 years agoMerge branch 'master' of gitorious.org:qt-jambi/qtjambi-4_7 into ant-refactor
Samu Voutilainen [Sat, 9 Oct 2010 13:27:10 +0000 (16:27 +0300)]
Merge branch 'master' of gitorious.org:qt-jambi/qtjambi-4_7 into ant-refactor

Conflicts:
setenv.xml

7 years agomore or less working rectored ant tasks
Samu Voutilainen [Sat, 2 Oct 2010 16:26:03 +0000 (19:26 +0300)]
more or less working rectored ant tasks

7 years agomore work for ant task refactor
Samu Voutilainen [Mon, 27 Sep 2010 21:18:04 +0000 (00:18 +0300)]
more work for ant task refactor

7 years agoSome more changes, not there quite yet on Linux
Helge [Wed, 22 Sep 2010 12:26:17 +0000 (14:26 +0200)]
Some more changes, not there quite yet on Linux

7 years agoMade that standalone hello world generator example build again. Since the build syste...
unknown [Wed, 22 Sep 2010 12:08:42 +0000 (14:08 +0200)]
Made that standalone hello world generator example build again. Since the build system will probably see more refactoring shortly by Smar I will wait a bit until repeating this for the other generator example apps.

7 years agoAdded 4.7.0 beta2 changelog
helge [Wed, 22 Sep 2010 07:33:44 +0000 (09:33 +0200)]
Added 4.7.0 beta2 changelog

7 years agomove java/src to src/java
Samu Voutilainen [Sun, 19 Sep 2010 16:32:12 +0000 (19:32 +0300)]
move java/src to src/java

7 years agoHmm, bringing back that launcher fix again to be sure 4.7-beta2
Helge Fredriksen [Fri, 17 Sep 2010 22:09:26 +0000 (00:09 +0200)]
Hmm, bringing back that launcher fix again to be sure

7 years agoForgot those fixes in setenv.xml
Helge Fredriksen [Fri, 17 Sep 2010 21:47:32 +0000 (23:47 +0200)]
Forgot those fixes in setenv.xml

7 years agoMade designer-integration compile against system qt. This works now on a ubuntu 10...
Helge Fredriksen [Fri, 17 Sep 2010 21:27:22 +0000 (23:27 +0200)]
Made designer-integration compile against system qt. This works now on a ubuntu 10.04 box

7 years agoRefactor build.xml
Samu Voutilainen [Fri, 17 Sep 2010 19:15:34 +0000 (22:15 +0300)]
Refactor build.xml

Merge branch 'master' of gitorious.org:qt-jambi/qtjambi-4_7

Conflicts:
build.xml
buildpath.properties

7 years agoMerge branch 'master' of git://gitorious.org/qt-jambi/qtjambi-4_7
Samu Voutilainen [Fri, 17 Sep 2010 13:53:16 +0000 (16:53 +0300)]
Merge branch 'master' of git://gitorious.org/qt-jambi/qtjambi-4_7

7 years agoIntroduce new variable to control whether phonon is KDE phonon or Qt
Samu Voutilainen [Fri, 17 Sep 2010 13:52:47 +0000 (16:52 +0300)]
Introduce new variable to control whether phonon is KDE phonon or Qt
phonon

7 years agoSome cleanup in the IntelliJ project files
unknown [Thu, 16 Sep 2010 08:47:00 +0000 (10:47 +0200)]
Some cleanup in the IntelliJ project files

7 years ago- add designer package back
Samu Voutilainen [Fri, 10 Sep 2010 11:29:51 +0000 (14:29 +0300)]
- add designer package back
- modify setenv.xml to dummy-set phonon properties if they are not set

7 years agoMerge branch 'master' of git://gitorious.org/qt-jambi/qtjambi-4_7
Samu Voutilainen [Fri, 10 Sep 2010 10:32:15 +0000 (13:32 +0300)]
Merge branch 'master' of git://gitorious.org/qt-jambi/qtjambi-4_7

7 years agofix NPE when phonon variables are empty
Samu Voutilainen [Fri, 10 Sep 2010 10:31:57 +0000 (13:31 +0300)]
fix NPE when phonon variables are empty

7 years agoAdded change log for 4.7.0-beta
General Build user [Mon, 6 Sep 2010 20:53:54 +0000 (22:53 +0200)]
Added change log for 4.7.0-beta

7 years agoreindented PlatformJarTask
Samu Voutilainen [Sun, 5 Sep 2010 13:10:41 +0000 (16:10 +0300)]
reindented PlatformJarTask

7 years agomove common includes to source folder
Samu Voutilainen [Sun, 5 Sep 2010 12:50:09 +0000 (15:50 +0300)]
move common includes to source folder

7 years agomove stuff from root to src folder
Samu Voutilainen [Sun, 5 Sep 2010 12:40:52 +0000 (15:40 +0300)]
move stuff from root to src folder
move stuff in generator to their own folders

7 years agoMerge branch 'master' of gitorious.org:qt-jambi/qtjambi-4_7
Samu Voutilainen [Sun, 5 Sep 2010 12:37:29 +0000 (15:37 +0300)]
Merge branch 'master' of gitorious.org:qt-jambi/qtjambi-4_7

7 years agoAdded back necessary designer plugin (not eclipse integration as we first thought)
unknown [Thu, 2 Sep 2010 20:36:44 +0000 (22:36 +0200)]
Added back necessary designer plugin (not eclipse integration as we first thought)

7 years agoSorry one more bogus commit
helge [Thu, 2 Sep 2010 13:20:24 +0000 (15:20 +0200)]
Sorry one more bogus commit

7 years agoWorkaround for the crash in qtjambi example app
helge [Thu, 2 Sep 2010 13:13:46 +0000 (15:13 +0200)]
Workaround for the crash in qtjambi example app

7 years agoRollback of that ownership test
helge [Thu, 2 Sep 2010 07:39:53 +0000 (09:39 +0200)]
Rollback of that ownership test

7 years agoCorrected some errors in the examples module + added ctrl-q help functionality on...
helge [Thu, 2 Sep 2010 07:34:57 +0000 (09:34 +0200)]
Corrected some errors in the examples module + added ctrl-q help functionality on the QtJambi symbols

7 years agoREADME on the setup
Helge Fredriksen [Tue, 31 Aug 2010 11:42:36 +0000 (13:42 +0200)]
README on the setup

7 years agoIntelliJ setup files for the java part of the qtjambi project. Sorry, no git support...
Helge Fredriksen [Tue, 31 Aug 2010 09:38:47 +0000 (11:38 +0200)]
IntelliJ setup files for the java part of the qtjambi project. Sorry, no git support for the examples yet

7 years agopath fix for java files
Samu Voutilainen [Sun, 29 Aug 2010 11:43:34 +0000 (14:43 +0300)]
path fix for java files

7 years agomoved typesystem xml files to generator/typesystem/xml
Samu Voutilainen [Sun, 29 Aug 2010 11:38:22 +0000 (14:38 +0300)]
moved typesystem xml files to generator/typesystem/xml

7 years agomove java typesystem files under generator/typesystem/java
Samu Voutilainen [Sun, 29 Aug 2010 11:23:41 +0000 (14:23 +0300)]
move java typesystem files under generator/typesystem/java

7 years agofix paths
Samu Voutilainen [Sun, 29 Aug 2010 11:21:40 +0000 (14:21 +0300)]
fix paths

7 years agomodified buildpath.properties to include sanitiezed build variables
Samu Voutilainen [Sat, 28 Aug 2010 14:57:58 +0000 (17:57 +0300)]
modified buildpath.properties to include sanitiezed build variables

7 years agomove handwritten Jambi files to src/cpp
Samu Voutilainen [Sun, 22 Aug 2010 19:09:05 +0000 (22:09 +0300)]
move handwritten Jambi files to src/cpp

7 years agoremove file marked for removal
Samu Voutilainen [Sun, 22 Aug 2010 18:26:10 +0000 (21:26 +0300)]
remove file marked for removal
tiny improvements for better path handling & version bump for javadoc script

7 years agoMake Jambi to compile with qt-4.7
Samu Voutilainen [Sat, 21 Aug 2010 17:35:58 +0000 (20:35 +0300)]
Make Jambi to compile with qt-4.7

7 years agoMerge git://gitorious.org/qt-jambi/community-port-to-4_6 into merge
Samu Voutilainen [Sat, 21 Aug 2010 15:19:06 +0000 (18:19 +0300)]
Merge git://gitorious.org/qt-jambi/community-port-to-4_6 into merge

Conflicts:
version.properties

7 years agoadd layout doc
Samu Voutilainen [Sat, 21 Aug 2010 15:16:01 +0000 (18:16 +0300)]
add layout doc

7 years agobuildpath.properties commented
Samu Voutilainen [Sat, 21 Aug 2010 11:28:20 +0000 (14:28 +0300)]
buildpath.properties commented

7 years agoMerge branch 'master' of git@gitorious.org:qt-jambi/qtjambi-4_7
Helge Fredriksen [Fri, 20 Aug 2010 19:53:17 +0000 (21:53 +0200)]
Merge branch 'master' of git@gitorious.org:qt-jambi/qtjambi-4_7

7 years agoSome changes to make 4.7 compile. Now compiles and links all native code
Helge Fredriksen [Fri, 20 Aug 2010 19:51:53 +0000 (21:51 +0200)]
Some changes to make 4.7 compile. Now compiles and links all native code

7 years agoMore modifications to make QtJambi compile on MacOSX
Arcnor [Fri, 20 Aug 2010 15:54:45 +0000 (17:54 +0200)]
More modifications to make QtJambi compile on MacOSX

7 years agofind_include_file modified to handle OSX style include directories
Samu Voutilainen [Fri, 20 Aug 2010 14:23:57 +0000 (17:23 +0300)]
find_include_file modified to handle OSX style include directories

7 years agofew modifications
Samu Voutilainen [Thu, 19 Aug 2010 20:21:57 +0000 (23:21 +0300)]
few modifications

7 years agoadd forgotten file
Samu Voutilainen [Sun, 15 Aug 2010 21:58:21 +0000 (00:58 +0300)]
add forgotten file

7 years ago-Modify ant tasks to allow use of ProcessBuilder for process launching
Samu Voutilainen [Sun, 15 Aug 2010 19:07:58 +0000 (22:07 +0300)]
-Modify ant tasks to allow use of ProcessBuilder for process launching
- Add new Exec class

7 years agobroken exec class.
Samu Voutilainen [Fri, 13 Aug 2010 12:59:08 +0000 (15:59 +0300)]
broken exec class.

We are now formally in 4.7 time

7 years agoChange log for 4.6.3
Helge Fredriksen [Fri, 9 Jul 2010 12:00:29 +0000 (14:00 +0200)]
Change log for 4.6.3

7 years agoMinor bug in installer script + launching doc in example app from web
Helge Fredriksen [Fri, 9 Jul 2010 10:45:03 +0000 (12:45 +0200)]
Minor bug in installer script + launching doc in example app from web

7 years agoWork on distribution of qtjambi-4.6.3 on Windows. designer should now work again
Helge Fredriksen [Fri, 9 Jul 2010 09:07:00 +0000 (11:07 +0200)]
Work on distribution of qtjambi-4.6.3 on Windows. designer should now work again

7 years agoRemove -static-libgcc
Samu Voutilainen [Tue, 29 Jun 2010 07:42:14 +0000 (10:42 +0300)]
Remove -static-libgcc

7 years agoMerge git://gitorious.org/qt-jambi/community-port-to-4_6 into merge
Samu Voutilainen [Tue, 29 Jun 2010 07:39:52 +0000 (10:39 +0300)]
Merge git://gitorious.org/qt-jambi/community-port-to-4_6 into merge

7 years agoAdded proper java-name to classes
Helge Fredriksen [Tue, 1 Jun 2010 20:02:42 +0000 (22:02 +0200)]
Added proper java-name to classes

7 years agoallow static windows linking with libgcc
Samu Voutilainen [Mon, 31 May 2010 13:45:08 +0000 (16:45 +0300)]
allow static windows linking with libgcc

7 years agoMerge branch 'master' of git://gitorious.org/~smar/qt-jambi/smar-sandbox
Samu Voutilainen [Mon, 31 May 2010 11:07:30 +0000 (14:07 +0300)]
Merge branch 'master' of git://gitorious.org/~smar/qt-jambi/smar-sandbox

7 years agoadd the missing sheep back...
Samu Voutilainen [Mon, 31 May 2010 11:07:07 +0000 (14:07 +0300)]
add the missing sheep back...

7 years agoMerge branch 'master' of git://gitorious.org/~smar/qt-jambi/smar-sandbox
unknown [Mon, 24 May 2010 13:31:11 +0000 (16:31 +0300)]
Merge branch 'master' of git://gitorious.org/~smar/qt-jambi/smar-sandbox

7 years agowindows fixes
unknown [Mon, 24 May 2010 13:30:55 +0000 (16:30 +0300)]
windows fixes

7 years agofix windows compilation
Samu Voutilainen [Mon, 24 May 2010 13:29:58 +0000 (16:29 +0300)]
fix windows compilation

7 years agothe missing file
Samu Voutilainen [Mon, 24 May 2010 09:08:59 +0000 (12:08 +0300)]
the missing file

7 years agofix the OSInfo. Hate that class.
Samu Voutilainen [Mon, 24 May 2010 09:06:36 +0000 (12:06 +0300)]
fix the OSInfo. Hate that class.