diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/inputmethod/inputmethod.pri | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/inputmethod/inputmethod.pri')
| -rw-r--r-- | src/gui/inputmethod/inputmethod.pri | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/gui/inputmethod/inputmethod.pri b/src/gui/inputmethod/inputmethod.pri deleted file mode 100644 index d4394380dc..0000000000 --- a/src/gui/inputmethod/inputmethod.pri +++ /dev/null @@ -1,31 +0,0 @@ -# Qt inputmethod module - -HEADERS +=inputmethod/qinputcontextfactory.h \ - inputmethod/qinputcontextplugin.h \ - inputmethod/qinputcontext_p.h \ - inputmethod/qinputcontext.h -SOURCES +=inputmethod/qinputcontextfactory.cpp \ - inputmethod/qinputcontextplugin.cpp \ - inputmethod/qinputcontext.cpp -x11 { - HEADERS += inputmethod/qximinputcontext_p.h - SOURCES += inputmethod/qximinputcontext_x11.cpp -} -win32 { - HEADERS += inputmethod/qwininputcontext_p.h - SOURCES += inputmethod/qwininputcontext_win.cpp -} -embedded { - HEADERS += inputmethod/qwsinputcontext_p.h - SOURCES += inputmethod/qwsinputcontext_qws.cpp -} -mac:!embedded:!qpa { - HEADERS += inputmethod/qmacinputcontext_p.h - SOURCES += inputmethod/qmacinputcontext_mac.cpp -} -symbian:contains(QT_CONFIG, s60) { - HEADERS += inputmethod/qcoefepinputcontext_p.h - SOURCES += inputmethod/qcoefepinputcontext_s60.cpp - LIBS += -lfepbase -lakninputlanguage -} - |