diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-24 03:10:05 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-24 03:10:05 -0500 |
commit | 596c6587c8e5263027705426647b43a5105f3bcd (patch) | |
tree | b864ce18ebbf1185a337cbbe4a817d08eac8dc57 /tqtinterface/qt4/src/inputmethod | |
parent | d3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5 (diff) | |
download | experimental-596c6587c8e5263027705426647b43a5105f3bcd.tar.gz experimental-596c6587c8e5263027705426647b43a5105f3bcd.zip |
Fixed FTBFS due to prior commit
Diffstat (limited to 'tqtinterface/qt4/src/inputmethod')
-rw-r--r-- | tqtinterface/qt4/src/inputmethod/qt_inputmethod.pri | 10 | ||||
-rw-r--r-- | tqtinterface/qt4/src/inputmethod/tqinputcontextfactory.cpp | 4 | ||||
-rw-r--r-- | tqtinterface/qt4/src/inputmethod/tqt_inputmethod.pri | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/tqtinterface/qt4/src/inputmethod/qt_inputmethod.pri b/tqtinterface/qt4/src/inputmethod/qt_inputmethod.pri new file mode 100644 index 0000000..59ccd37 --- /dev/null +++ b/tqtinterface/qt4/src/inputmethod/qt_inputmethod.pri @@ -0,0 +1,10 @@ +# TQt inputmetod module + +inputmethod { + INPUTMETHOD_P = inputmethod + HEADERS +=$$INPUTMETHOD_H/tqinputcontextfactory.h \ + $$INPUTMETHOD_P/tqinputcontextinterface_p.h \ + $$INPUTMETHOD_H/tqinputcontextplugin.h + SOURCES +=$$INPUTMETHOD_CPP/tqinputcontextfactory.cpp \ + $$INPUTMETHOD_CPP/tqinputcontextplugin.cpp +} diff --git a/tqtinterface/qt4/src/inputmethod/tqinputcontextfactory.cpp b/tqtinterface/qt4/src/inputmethod/tqinputcontextfactory.cpp index 276085d..2f0e272 100644 --- a/tqtinterface/qt4/src/inputmethod/tqinputcontextfactory.cpp +++ b/tqtinterface/qt4/src/inputmethod/tqinputcontextfactory.cpp @@ -64,8 +64,8 @@ static void create_manager() #ifdef TQT_THREAD_SUPPORT // protect manager creation - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &manager ) : 0); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &manager ) : 0); // we check the manager pointer again to make sure that another thread // has not created the manager before us. diff --git a/tqtinterface/qt4/src/inputmethod/tqt_inputmethod.pri b/tqtinterface/qt4/src/inputmethod/tqt_inputmethod.pri deleted file mode 100644 index 0d48026..0000000 --- a/tqtinterface/qt4/src/inputmethod/tqt_inputmethod.pri +++ /dev/null @@ -1,10 +0,0 @@ -# TQt inputmetod module - -inputmethod { - INPUTMETHOD_P = inputmethod - HEADERS +=$$INPUTMETHOD_H/qinputcontextfactory.h \ - $$INPUTMETHOD_P/qinputcontextinterface_p.h \ - $$INPUTMETHOD_H/qinputcontextplugin.h - SOURCES +=$$INPUTMETHOD_CPP/qinputcontextfactory.cpp \ - $$INPUTMETHOD_CPP/qinputcontextplugin.cpp -} |