diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-05-10 15:35:50 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2012-05-15 14:39:35 +0200 |
| commit | 8a619f580b313c9373b816f059d91c208eb89400 (patch) | |
| tree | 0a391abcc192a775d8192872cb1e773f6a691a1a /src/src.pro | |
| parent | f92f1b727626c4f7b0b99f0e1e28a34d35e58530 (diff) | |
| download | qtquickcontrols-8a619f580b313c9373b816f059d91c208eb89400.tar.gz | |
Port menus to Qt 5.
Copy over qtmenu and qtmenuitem from the Qt 4 branch.
Register types in qstyleplugin.cpp.
Delete Menu.qml MenuItem.qml - no longer in use
and replaced by C++ code.
Some porting was necessary, in particular changing
QtMenuBase's base class from QObject to QtQuickItem.
Bugs: On OS X the menu bar is displayed only ~50%
if the time. Other platforms are not tested.
Context menus do not work.
Change-Id: I4e9cc6952ec1c70dc28cfda2352ba9962b539b17
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index b3336a2d..e2d6b226 100644 --- a/src/src.pro +++ b/src/src.pro @@ -10,12 +10,15 @@ DESTDIR = ../components/plugin OBJECTS_DIR = obj MOC_DIR = moc -HEADERS += qrangemodel_p.h \ +HEADERS += qtmenu.h \ + qtmenubar.h \ + qrangemodel_p.h \ qrangemodel.h \ qstyleplugin.h \ qdeclarativefolderlistmodel.h \ qstyleitem.h \ qwheelarea.h \ + qtmenuitem.h \ qwindowitem.h \ qdesktopitem.h \ qtoplevelwindow.h \ @@ -23,11 +26,14 @@ HEADERS += qrangemodel_p.h \ qtooltiparea.h \ qtsplitterbase.h -SOURCES += qrangemodel.cpp \ +SOURCES += qtmenu.cpp \ + qtmenubar.cpp \ + qrangemodel.cpp \ qstyleplugin.cpp \ qdeclarativefolderlistmodel.cpp \ qstyleitem.cpp \ qwheelarea.cpp \ + qtmenuitem.cpp \ qwindowitem.cpp \ qdesktopitem.cpp \ qtoplevelwindow.cpp \ |