wang-bin 6c7a4f6a27 Merge branch '5.4build' ...

Conflicts:
	examples/common/common.pro

2014-11-04 10:48:54 +08:00

..

theme

qmlplayer: fill mode shortcut etc

2014-01-26 01:53:05 +08:00

common_export.h

qmlplayer: store configurations

2014-11-02 19:33:14 +08:00

common.cpp

qmlplayer: ui, translation

2014-11-02 14:28:03 +08:00

common.h

qmlplayer: store configurations

2014-11-02 19:33:14 +08:00

common.pro

Merge branch '5.4build'

2014-11-04 10:48:54 +08:00

Config.cpp

qmlplayer: more subtitle configurations

2014-11-02 21:16:54 +08:00

Config.h

qmlplayer: more subtitle configurations

2014-11-02 21:16:54 +08:00

libcommon.pri

QtAV target name is Qt5AV for Qt>=5.4beta

2014-11-04 10:45:49 +08:00

qoptions.cpp

qoptions: crash if command line value not given at the end

2014-11-03 16:09:19 +08:00

qoptions.h

player: add command line option class

2014-10-30 13:47:05 +08:00

ScreenSaver.cpp

fix build error.

2014-04-11 19:07:50 +08:00

ScreenSaver.h

qmlplayer: store configurations

2014-11-02 19:33:14 +08:00