diff options
| author | Sergiy Dubovik <sergiy.dubovik@nokia.com> | 2010-04-12 14:25:33 +0300 |
|---|---|---|
| committer | Sergiy Dubovik <sergiy.dubovik@nokia.com> | 2010-04-12 14:40:50 +0300 |
| commit | 68b77a7163029325425b586c92c3f6f028bab477 (patch) | |
| tree | ad88e1e977da810e940d3302a7b98ab4cac1c3ac | |
| parent | 85804a9f7f8047bfa6dd00ab3fd6ff950edbab60 (diff) | |
Changes: Fixed compilation on Mac. Fixed compilation with Qt 4.7.
RevBy: TrustMe
| -rw-r--r-- | demos/animatedlayout/animatedlayout.pro | 3 | ||||
| -rw-r--r-- | demos/widgetsgallery/widgetsgallery.pro | 4 | ||||
| -rw-r--r-- | mgen/mgen_processor.cpp | 2 | ||||
| -rw-r--r-- | src/common_bot.pri | 7 | ||||
| -rw-r--r-- | src/src.pro | 1 | ||||
| -rw-r--r-- | src/views/views.pro | 9 |
6 files changed, 14 insertions, 12 deletions
diff --git a/demos/animatedlayout/animatedlayout.pro b/demos/animatedlayout/animatedlayout.pro index 44458abc..82107d03 100644 --- a/demos/animatedlayout/animatedlayout.pro +++ b/demos/animatedlayout/animatedlayout.pro @@ -16,7 +16,8 @@ QMAKE_LIBDIR += \ win32|macx { macx { QMAKE_LFLAGS += -F../../lib - LIBS += -framework m + LIBS += -framework meegotouchcore \ + -framework meegotouchviews } win32:LIBS += -lmeegotouch0 } else { diff --git a/demos/widgetsgallery/widgetsgallery.pro b/demos/widgetsgallery/widgetsgallery.pro index e007f819..09e14ebe 100644 --- a/demos/widgetsgallery/widgetsgallery.pro +++ b/demos/widgetsgallery/widgetsgallery.pro @@ -12,8 +12,8 @@ QMAKE_LIBDIR += $$MLIB win32|macx { macx { QMAKE_LFLAGS += -F../../lib - LIBS += -framework \ - m + LIBS += -framework meegotouchcore \ + -framework meegotouchviews } win32:LIBS += -lmeegotouchcore0 } diff --git a/mgen/mgen_processor.cpp b/mgen/mgen_processor.cpp index 1c84ad94..0d147f46 100644 --- a/mgen/mgen_processor.cpp +++ b/mgen/mgen_processor.cpp @@ -940,7 +940,7 @@ void generateStyleDataCpp(const StyleClass *c, const QList<QString>& modes, cons ++i; for(; i != e; ++i) { if(i->isUpper()) - mode += "-" + i->toLower(); + mode += QString('-') + i->toLower(); else mode += *i; } diff --git a/src/common_bot.pri b/src/common_bot.pri index 50c945aa..fc21b3b9 100644 --- a/src/common_bot.pri +++ b/src/common_bot.pri @@ -2,13 +2,6 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS -macx { - FRAMEWORK_HEADERS.version = Versions - FRAMEWORK_HEADERS.files = $$system(find include/M*) $$HEADERS - FRAMEWORK_HEADERS.path = Headers - QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS -} - install_headers.path = $$M_INSTALL_HEADERS install_headers.files = $$PUBLIC_HEADERS diff --git a/src/src.pro b/src/src.pro index ac917ab9..ee389860 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,3 +5,4 @@ SUBDIRS += \ views \ settings \ extensions +macx:SUBDIRS -= settings extensions
\ No newline at end of file diff --git a/src/views/views.pro b/src/views/views.pro index 47f2b6bd..0e4221e7 100644 --- a/src/views/views.pro +++ b/src/views/views.pro @@ -16,7 +16,14 @@ include(views.pri) include(widgets/widgets.pri) include(style/style.pri) -LIBS += -lmeegotouchcore +win32|macx { + macx { + QMAKE_LFLAGS += -F../../lib + LIBS += -framework meegotouchcore + } + win32:LIBS += -lmeegotouchcore0 +} +else:LIBS += -lmeegotouchcore SOURCES += mviewslibrary.cpp |