diff options
| -rw-r--r-- | demos/widgetsgallery/widgetsgallery.pro | 5 | ||||
| -rw-r--r-- | mkspecs/features/meegotouch_defines.prf.in | 20 | ||||
| -rw-r--r-- | src/common_top.pri | 2 | ||||
| -rw-r--r-- | src/views/views.pro | 1 |
4 files changed, 14 insertions, 14 deletions
diff --git a/demos/widgetsgallery/widgetsgallery.pro b/demos/widgetsgallery/widgetsgallery.pro index fb7ae417..202ee2bc 100644 --- a/demos/widgetsgallery/widgetsgallery.pro +++ b/demos/widgetsgallery/widgetsgallery.pro @@ -11,8 +11,9 @@ INCLUDEPATH += . \ QMAKE_LIBDIR += $$MLIB LIBS += $$mAddLibrary(meegotouchcore) \ - $$mAddLibrary(meegotouchviews) \ - $$mAddLibrary(meegotouchsettings) \ + $$mAddLibrary(meegotouchviews) + +!macx:LIBS += $$mAddLibrary(meegotouchsettings) \ $$mAddLibrary(meegotouchextensions) TEMPLATE = app diff --git a/mkspecs/features/meegotouch_defines.prf.in b/mkspecs/features/meegotouch_defines.prf.in index af8e84b9..b6387e78 100644 --- a/mkspecs/features/meegotouch_defines.prf.in +++ b/mkspecs/features/meegotouch_defines.prf.in @@ -111,17 +111,17 @@ win32 { defineReplace(mAddLibrary) { LIBRARY_NAME = $$1 + win32 { + CONFIG(debug, debug|release) { + return ("-l"$${LIBRARY_NAME}d$${M_MAJOR_VERSION}) + } else { + return ("-l"$${LIBRARY_NAME}$${M_MAJOR_VERSION}) + } + } macx { - QMAKE_LFLAGS *= -F $$M_BUILD_TREE/lib - return (-framework $$LIBRARY_NAME) - } else { - win32 { - CONFIG(debug, debug|release) { - return ("-l"$${LIBRARY_NAME}d$${M_MAJOR_VERSION}) - } else { - return ("-l"$${LIBRARY_NAME}$${M_MAJOR_VERSION}) - } + CONFIG(debug, debug|release) { + return ("-l"$${LIBRARY_NAME}_debug) } - return (-l$$LIBRARY_NAME) } + return (-l$$LIBRARY_NAME) } diff --git a/src/common_top.pri b/src/common_top.pri index b26c0d1d..69a76423 100644 --- a/src/common_top.pri +++ b/src/common_top.pri @@ -22,7 +22,7 @@ QMAKE_STRIP = echo CONFIG += qt warn_on depend_includepath qmake_cache target_qt dll create_prl !win32:CONFIG += link_pkgconfig -macx:CONFIG += lib_bundle +macx:CONFIG -= lib_bundle QMAKE_CXXFLAGS += -DM_EXPORTS !win32-msvc*:QMAKE_CXXFLAGS += -Wno-long-long -pedantic diff --git a/src/views/views.pro b/src/views/views.pro index 06ae0b4d..9662a559 100644 --- a/src/views/views.pro +++ b/src/views/views.pro @@ -22,7 +22,6 @@ include(style/style.pri) include(video/video.pri) LIBS += $$mAddLibrary(meegotouchcore) - SOURCES += mviewslibrary.cpp include(../common_bot.pri) |